Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-01-31 14:44:03 +0100
committerMartin Hořeňovský2020-01-31 14:44:40 +0100
commita7b3e087a03f6ba33100c842445f16757d545fc0 (patch)
treea99a5309118b3fe4fc8c833fcffd61e259ab6438
parentddd0e7218d884fca75dc2e6413ccb94851b3f264 (diff)
downloadcatch3-a7b3e087a03f6ba33100c842445f16757d545fc0.tar.gz
Fix coverage collection on AppVeyor
-rw-r--r--appveyor.yml9
-rw-r--r--codecov.yml1
-rw-r--r--tools/misc/appveyorBuildConfigurationScript.bat2
3 files changed, 4 insertions, 8 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 986601a2..8e57a59c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -56,15 +56,10 @@ environment:
platform: x64
configuration: Release
- - FLAVOR: VS 2019 x64 Debug Coverage
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
- coverage: 1
- platform: x64
- configuration: Debug
-
- - FLAVOR: VS 2019 x64 Debug Examples
+ - FLAVOR: VS 2019 x64 Debug Coverage Examples
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019
examples: 1
+ coverage: 1
platform: x64
configuration: Debug
diff --git a/codecov.yml b/codecov.yml
index aaa692f1..b9af22f9 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -15,6 +15,7 @@ coverage:
codecov:
branch: master
+ max_report_age: off
comment:
layout: "diff"
diff --git a/tools/misc/appveyorBuildConfigurationScript.bat b/tools/misc/appveyorBuildConfigurationScript.bat
index 602f1fd3..6241b781 100644
--- a/tools/misc/appveyorBuildConfigurationScript.bat
+++ b/tools/misc/appveyorBuildConfigurationScript.bat
@@ -10,7 +10,7 @@ if "%CONFIGURATION%"=="Debug" (
@REM # coverage needs to build the special helper as well as the main
cmake -Htools/misc -Bbuild-misc -A%PLATFORM% || exit /b !ERRORLEVEL!
cmake --build build-misc || exit /b !ERRORLEVEL!
- 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!
+ cmake -H. -BBuild -A%PLATFORM% -DUSE_WMAIN=%wmain% -DMEMORYCHECK_COMMAND=build-misc\Debug\CoverageHelper.exe -DMEMORYCHECK_COMMAND_OPTIONS=--sep-- -DMEMORYCHECK_TYPE=Valgrind -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% || exit /b !ERRORLEVEL!
) else (
@REM # We know that coverage is 0
cmake -H. -BBuild -A%PLATFORM% -DUSE_WMAIN=%wmain% -DCATCH_BUILD_EXAMPLES=%examples% -DCATCH_BUILD_EXTRA_TESTS=%examples% || exit /b !ERRORLEVEL!