From a7b3e087a03f6ba33100c842445f16757d545fc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?=
 <martin.horenovsky@gmail.com>
Date: Fri, 31 Jan 2020 14:44:03 +0100
Subject: [PATCH] Fix coverage collection on AppVeyor

---
 appveyor.yml                                    | 9 ++-------
 codecov.yml                                     | 1 +
 tools/misc/appveyorBuildConfigurationScript.bat | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 986601a284..8e57a59c38 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 aaa692f140..b9af22f925 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 602f1fd38c..6241b78130 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!