diff options
| author | Martin Hořeňovský | 2019-12-15 21:17:53 +0100 |
|---|---|---|
| committer | Martin Hořeňovský | 2019-12-16 00:15:30 +0100 |
| commit | ebeeaaeec673ebab87d5ef0ba3aa63b2791e3406 (patch) | |
| tree | d536c43909fe048d118f805c09542247498058c0 /tools | |
| parent | 69bd213c40939f0611d073b0a239c659be1f2613 (diff) | |
| download | catch3-ebeeaaeec673ebab87d5ef0ba3aa63b2791e3406.tar.gz | |
Reenable appveyor for CI
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/misc/appveyorBuildConfigurationScript.bat | 1 | ||||
| -rw-r--r-- | tools/misc/appveyorMergeCoverageScript.py | 2 |
2 files changed, 1 insertions, 2 deletions
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) |