mixxxdj · Holzhaus · Feb 11, 2020 · Sep 17, 2019 · Sep 17, 2019 · Sep 17, 2019
diff --git a/appveyor.yml b/appveyor.yml
@@ -31,7 +31,8 @@ matrix:
 skip_commits:
   files:
     - doc/
-    - LICENCE
+    - .travis.yml
+    - LICENSE
     - README
     - README.md
     - CHANGELOG
@@ -48,20 +49,82 @@ for:
 
   clone_folder: /home/appveyor/projects/mixxx
 
+  cache:
+    - /home/appveyor/.ccache
+
   install:
     - sudo apt-get update
-    - sudo apt-get -y install gdb libavformat-dev libchromaprint-dev libfaad-dev libflac-dev libid3tag0-dev libmad0-dev libmodplug-dev libmp3lame-dev libmp4v2-dev libopus-dev libopusfile-dev libportmidi-dev libprotobuf-dev libqt5opengl5-dev libqt5sql5-sqlite libqt5svg5-dev librubberband-dev libshout3-dev libsndfile1-dev libsqlite3-dev libtag1-dev libupower-glib-dev libusb-1.0-0-dev libwavpack-dev portaudio19-dev protobuf-compiler qt5-default qtscript5-dev libqt5x11extras5-dev scons qt5keychain-dev liblilv-dev libsoundtouch-dev
+    - sudo apt-get -y install
+      ccache
+      gdb
+      libavformat-dev
+      libchromaprint-dev
+      libfaad-dev
+      libflac-dev
+      libid3tag0-dev
+      liblilv-dev
+      libmad0-dev
+      libmodplug-dev
+      libmp3lame-dev
+      libmp4v2-dev
+      libopus-dev
+      libopusfile-dev
+      libportmidi-dev
+      libprotobuf-dev
+      libqt5opengl5-dev
+      libqt5sql5-sqlite
+      libqt5svg5-dev
+      libqt5x11extras5-dev
+      librubberband-dev
+      libshout3-dev
+      libsndfile1-dev
+      libsoundtouch-dev
+      libsqlite3-dev
+      libtag1-dev
+      libupower-glib-dev
+      libusb-1.0-0-dev
+      libwavpack-dev
+      portaudio19-dev
+      protobuf-compiler
+      python-pip
+      qt5-default
+      qt5keychain-dev
+      qtscript5-dev
+      xsltproc
+    - sudo pip install cmake
+
+  before_build:
+     # Limit cache size to 100 MB
+    - ccache -M 100M
+    - ccache -c
+    - ccache -s
 
   build_script:
-    # ffmpeg=1 requires FFmpeg 4.0, but Ubuntu 18.04 still provides only FFmpeg 3.4.x
-    - scons -j4 test=1 mad=1 faad=1 opus=1 modplug=1 wv=1 hss1394=0 virtualize=0 debug_assertions_fatal=1 verbose=0 localecompare=1
+    - export CMAKE_BUILD_PARALLEL_LEVEL="$(nproc)"
+    - mkdir cmake_build
+    - cd cmake_build
+    - cmake
+      -L
+      -DFAAD=ON
+      -DHSS1394=OFF
+      -DLOCALECOMPARE=ON
+      -DMAD=ON
+      -DMODPLUG=ON
+      -DOPUS=ON
+      -DWAVPACK=ON
+      ..
+    - cmake --build .
+    - sudo cmake --build . --target install
 
   test_script:
-    - xvfb-run -- ./mixxx-test --gtest_output=xml:test_results.xml
-    - xvfb-run -- ./mixxx-test --benchmark
+    - export CTEST_OUTPUT_ON_FAILURE=1
+    - xvfb-run -- ctest -T test --no-compress-output
+    - xvfb-run -- cmake --build . --target benchmark
 
   after_test:
-    - curl -F 'file=@test_results.xml' "https://ci.appveyor.com/api/testresults/junit/$APPVEYOR_JOB_ID"
+    - xsltproc -o ctest-to-junit-results.xml ../cmake/ctest-to-junit.xsl Testing/*/Test.xml
+    - curl -F 'file=@ctest-to-junit-results.xml' "https://ci.appveyor.com/api/testresults/junit/$APPVEYOR_JOB_ID"
+
 
 ########## END UBUNTU SPECIFIC CONFIGURATION ##########
 
@@ -81,41 +144,90 @@ for:
 
   cache:
     - C:\mixxx-buildserver
+    - C:\Users\appveyor\clcache
 
   environment:
     ENVIRONMENTS_URL: https://downloads.mixxx.org/builds/buildserver/2.3.x-windows/
     ENVIRONMENTS_PATH: C:\mixxx-buildserver
+    ENVIRONMENT_NAME: 2.3-j00013-PLATFORM-CONFIGURATION-static-36f44bd2-minimal
+    QT_VERSION: 5.12.0
+    MSVC_PATH: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community"
+    PATH: 'C:\Python37-x64;C:\Python37-x64\Scripts;%PATH%'
+
 
   install:
-    - set /P ENVIRONMENT_NAME=<build/windows/golden_environment
-    - call set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:PLATFORM=%platform%%%
-    - call set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:CONFIGURATION=%configuration%%%
-    - cd %TEMP%
-    - echo *** Downloading precompiled build environment if not in build-cache
-    - cd %APPVEYOR_BUILD_FOLDER%
-    - build\windows\install_buildenv.bat %ENVIRONMENTS_URL% %ENVIRONMENT_NAME% %ENVIRONMENTS_PATH%
+    - set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:PLATFORM=%platform%%%
+    - set ENVIRONMENT_NAME=%%ENVIRONMENT_NAME:CONFIGURATION=%configuration%%%
+    - set WINLIB_PATH=%ENVIRONMENTS_PATH%\%ENVIRONMENT_NAME%
+    - IF EXIST %WINLIB_PATH% (
+        echo Using cached environment %WINLIB_PATH%...
+      ) else (
+        mkdir %ENVIRONMENTS_PATH% &&
+        echo Downloading environment %ENVIRONMENT_NAME%... &&
+        curl -fsS -L -o%ENVIRONMENTS_PATH%\%ENVIRONMENT_NAME%.zip %ENVIRONMENTS_URL%/%ENVIRONMENT_NAME%.zip &&
+        echo Unpacking environment %ENVIRONMENT_NAME% to %ENVIRONMENTS_PATH%... &&
+        7z -o%ENVIRONMENTS_PATH% x %ENVIRONMENTS_PATH%\%ENVIRONMENT_NAME%.zip || exit 1
+      )
+    - choco install ninja
+    - python -m pip install git+https://github.com/frerich/clcache.git
 
   before_build:
+    - set PATH=%PATH:C:\Program Files\Git\usr\bin;=%
+    - set QT_PATH=%WINLIB_PATH%\Qt-%QT_VERSION%
+    - set CMAKE_BUILD_PARALLEL_LEVEL=%NUMBER_OF_CORES%
+    - call "%MSVC_PATH%\VC\Auxiliary\Build\vcvarsall.bat" x64
     - cd %APPVEYOR_BUILD_FOLDER%
+     # Limit cache size to 100 MB
+    - clcache -M 100000000
+    - clcache -c
+    - clcache -s
+    # Improve clcache performance
+    - set CLCACHE_SERVER=1
+    - set CLCACHE_HARDLINK=1
+    - ps: Start-Process clcache-server
 
   build_script:
-    - build\appveyor\build_mixxx.bat %platform% %configuration% %ENVIRONMENTS_PATH%\%ENVIRONMENT_NAME%
+    - mkdir cmake_build
+    - cd cmake_build
+    - cmake
+      -L
+      -DCMAKE_BUILD_TYPE=Release
+      -DCMAKE_INSTALL_PREFIX=C:\mixxx
+      -DCMAKE_PREFIX_PATH=%WINLIB_PATH%;%QT_PATH%
+      -DMEDIAFOUNDATION=ON
+      -DOPUS=ON
+      -DLOCALECOMPARE=ON
+      -DSTATIC_DEPS=ON
+      -G "Ninja"
+      ..
+    - cmake --build .
+    - cmake --build . --target install
+    # Generate EXE/MSI installers
+    - cpack -G "NSIS"
+    - cpack -G "WIX"
 
   test_script:
-    - echo *** Testing
-    # Calling mixxx-test under bash to have standard output
-    # and use stdbuf to unbuffer standard & error output
-    - bash -c "stdbuf -oL -eL dist*/mixxx-test.exe --gtest_output=xml:test_results.xml 2>&1"
-    - timeout 5 > NUL
-    - bash -c "stdbuf -oL -eL dist*/mixxx-test.exe --benchmark 2>&1"
-    - timeout 5 > NUL
+    # Calling mixxx-test under bash to have standard output and use stdbuf to
+    # unbuffer standard & error output
+    - set CTEST_OUTPUT_ON_FAILURE=1
+    - ctest -C "Release" -T test --no-compress-output
+    - cmake --build . --target benchmark
 
   after_test:
-    - ps: (new-object net.webclient).UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\test_results.xml))
+    # Found at https://help.appveyor.com/discussions/suggestions/5298-support-ctest-xml-test-results
+    - ps: |
+        $ctest_xml = Get-ChildItem -Path Testing\*\Test.xml
+        $ctest_to_junit_xsl = Get-ChildItem -Path ..\cmake\ctest-to-junit.xsl
+        $XSLInputElement = New-Object System.Xml.Xsl.XslCompiledTransform
+        $XSLInputElement.Load($ctest_to_junit_xsl)
+        $XSLInputElement.Transform((Resolve-Path $ctest_xml), (Join-Path (Resolve-Path .) "ctest-to-junit-results.xml"))
+        $wc = New-Object 'System.Net.WebClient'
+        $wc.UploadFile("https://ci.appveyor.com/api/testresults/junit/$($env:APPVEYOR_JOB_ID)", (Resolve-Path .\ctest-to-junit-results.xml))
+
 
   artifacts:
-    - path: '*.exe'
-    - path: '*.msi'
+    - path: 'cmake_build/*.exe'
+    - path: 'cmake_build/*.msi'
 
   on_finish:
     # Uncomment the following line if you don't want the build VM to be destroyed

diff --git a/cmake/ctest-to-junit.xsl b/cmake/ctest-to-junit.xsl
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+This XSLT stylesheet is taken from the jenkins-ctest-plugin by Version One,
+Inc. and Ryan Pavlik <abiryan@ryand.net> and is subject to the terms of the
+MIT License.
+
+It was taken from this GitHub repositiory:
+    https://github.com/rpavlik/jenkins-ctest-plugin
+
+Includes modifications by Jan Holthuis to add support for skipped/errored
+tests.
+-->
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+	<xsl:output method="xml" indent="yes" />
+	<xsl:template match="/">
+		<testsuites>
+			<xsl:variable name="buildName" select="//Site/@BuildName"/>
+			<xsl:variable name="numberOfTests" select="count(//Site/Testing/Test)"/>
+			<xsl:variable name="numberOfFailures" select="count(//Site/Testing/Test[@Status!='passed'])" />
+			<testsuite name="CTest"
+				tests="{$numberOfTests}" time="0"
+				failures="{$numberOfFailures}"  errors="0"
+				skipped="0">
+			<xsl:for-each select="//Site/Testing/Test">
+					<xsl:variable name="testName" select="translate(Name, '-', '_')"/>
+					<xsl:variable name="duration" select="Results/NamedMeasurement[@name='Execution Time']/Value"/>
+					<xsl:variable name="status" select="@Status"/>
+					<xsl:variable name="output" select="Results/Measurement/Value"/>
+					<xsl:variable name="className" select="translate(Path, '/.', '.')"/>
+					<testcase classname="projectroot{$className}"
+						name="{$testName}"
+						time="{$duration}">
+						<xsl:if test="@Status='failed'">
+							<failure>
+								<xsl:value-of select="$output" />
+							</failure>
+						</xsl:if>
+						<xsl:if test="@Status='errored'">
+							<error>
+								<xsl:value-of select="$output" />
+							</error>
+						</xsl:if>
+						<xsl:if test="@Status='notrun'">
+							<skipped />
+						</xsl:if>
+						<system-out>
+							<xsl:value-of select="$output" />
+						</system-out>
+					</testcase>
+				</xsl:for-each>
+			</testsuite>
+		</testsuites>
+	</xsl:template>
+</xsl:stylesheet>