From ebeeaaeec673ebab87d5ef0ba3aa63b2791e3406 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sun, 15 Dec 2019 21:17:53 +0100 Subject: [PATCH] Reenable appveyor for CI --- appveyor.yml | 4 ++-- tools/misc/appveyorBuildConfigurationScript.bat | 1 - tools/misc/appveyorMergeCoverageScript.py | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 485732a9..986601a2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -26,7 +26,7 @@ before_build: # Indirection because appveyor doesn't handle multiline batch scripts properly # https://stackoverflow.com/questions/37627248/how-to-split-a-command-over-multiple-lines-in-appveyor-yml/37647169#37647169 # https://help.appveyor.com/discussions/questions/3888-multi-line-cmd-or-powershell-warning-ignore - - cmd: .\misc\appveyorBuildConfigurationScript.bat + - cmd: .\tools\misc\appveyorBuildConfigurationScript.bat # build with MSBuild @@ -37,7 +37,7 @@ build: test_script: - set CTEST_OUTPUT_ON_FAILURE=1 - - cmd: .\misc\appveyorTestRunScript.bat + - cmd: .\tools\misc\appveyorTestRunScript.bat # Sadly we cannot use the standard "dimensions" based approach towards diff --git a/tools/misc/appveyorBuildConfigurationScript.bat b/tools/misc/appveyorBuildConfigurationScript.bat index 5933da38..602f1fd3 100644 --- a/tools/misc/appveyorBuildConfigurationScript.bat +++ b/tools/misc/appveyorBuildConfigurationScript.bat @@ -13,7 +13,6 @@ if "%CONFIGURATION%"=="Debug" ( cmake -H. -BBuild -A%PLATFORM% -DUSE_WMAIN=%wmain% -DMEMORYCHECK_COMMAND=build-misc\Debug\CoverageHelper.exe -DMEMORYCHECK_COMMAND_OPTIONS=--sep-- -DMEMORYCHECK_TYPE=Valgrind || exit /b !ERRORLEVEL! || exit /b !ERRORLEVEL! ) else ( @REM # We know that coverage is 0 - python scripts\generateSingleHeader.py || exit /b !ERRORLEVEL! cmake -H. -BBuild -A%PLATFORM% -DUSE_WMAIN=%wmain% -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% || exit /b !ERRORLEVEL! ) ) diff --git a/tools/misc/appveyorMergeCoverageScript.py b/tools/misc/appveyorMergeCoverageScript.py index 93a47fff..7cf408d2 100644 --- a/tools/misc/appveyorMergeCoverageScript.py +++ b/tools/misc/appveyorMergeCoverageScript.py @@ -4,6 +4,6 @@ import glob import subprocess if __name__ == '__main__': - cov_files = list(glob.glob('projects/cov-report*.bin')) + cov_files = list(glob.glob('tests/cov-report*.bin')) base_cmd = ['OpenCppCoverage', '--quiet', '--export_type=cobertura:cobertura.xml'] + ['--input_coverage={}'.format(f) for f in cov_files] subprocess.check_call(base_cmd)