From 08d95df64a7201e54801d107bf8733606f9cd76d Mon Sep 17 00:00:00 2001
From: Yumi Bagge <yumi.bagge@diffblue.com>
Date: Wed, 18 Sep 2019 17:11:59 +0100
Subject: [PATCH] Remove 'unit' from coverage report file

---
 buildspec-linux-make-gcc-cov.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/buildspec-linux-make-gcc-cov.yml b/buildspec-linux-make-gcc-cov.yml
index 00d4e819bc..de9de8064a 100644
--- a/buildspec-linux-make-gcc-cov.yml
+++ b/buildspec-linux-make-gcc-cov.yml
@@ -28,7 +28,7 @@ phases:
       # Run unit test
       - make -C unit test
       - lcov --capture --directory . --output-file lcov.info
-      - lcov --remove lcov.info '/usr/*' --output-file lcov.info
+      - lcov --remove lcov.info '/usr/*' '*/unit/*' --output-file lcov.info
       # If $CODEBUILD_SOURCE_VERSION starts with 'pr/', filter out pr number, if not, return empty
       - VCS_PULL_REQUEST=$(echo $CODEBUILD_SOURCE_VERSION | sed '/^pr\//!d;s/^pr\///')
       # If $CODEBUILD_SOURCE_VERSION is commit id, set $VCS_COMMIT_ID
@@ -46,31 +46,31 @@ phases:
       # regression/invariants
       - make -C regression test CPROVER_WITH_PROFILING=1
       - lcov --capture --directory . --output-file lcov.info
-      - lcov --remove lcov.info '/usr/*' --output-file lcov.info
+      - lcov --remove lcov.info '/usr/*' '*/unit/*' --output-file lcov.info
       - bash $COV_SCRIPT -t "$CODECOV_TOKEN" -f lcov.info -c -F unit || true
       # Run regression/cbmc tests with test-paths lifo option
       - lcov --zerocounters --directory .
       - make -C regression/cbmc test-paths-lifo
       - lcov --capture --directory . --output-file lcov.info
-      - lcov --remove lcov.info '/usr/*' --output-file lcov.info
+      - lcov --remove lcov.info '/usr/*' '*/unit/*' --output-file lcov.info
       - bash $COV_SCRIPT -t "$CODECOV_TOKEN" -f lcov.info -c -F cbmcreglifo || true
       # Run regression/cbmc tests with test-cprover-smt2
-      - lcov --zerocounters
+      - lcov --zerocounters --directory .
       - env PATH=$PATH:`pwd`/src/solvers make -C regression/cbmc test-cprover-smt2
       - lcov --capture --directory . --output-file lcov.info
-      - lcov --remove lcov.info '/usr/*' --output-file lcov.info
+      - lcov --remove lcov.info '/usr/*' '*/unit/*' --output-file lcov.info
       - bash $COV_SCRIPT -t "$CODECOV_TOKEN" -f lcov.info -c -F cbmcregsmt2 || true
       # Run jbmc unit tests
       - lcov --zerocounters --directory .
       - make -C jbmc/unit test
       - lcov --capture --directory . --output-file lcov.info
-      - lcov --remove lcov.info '/usr/*' --output-file lcov.info
+      - lcov --remove lcov.info '/usr/*' '*/unit/*' --output-file lcov.info
       - bash $COV_SCRIPT -t "$CODECOV_TOKEN" -f lcov.info -c -F jbmcunit || true
       # Run jbmc regression tests
       - lcov --zerocounters --directory .
       - make -C jbmc/regression test
       - lcov --capture --directory . --output-file lcov.info
-      - lcov --remove lcov.info '/usr/*' --output-file lcov.info
+      - lcov --remove lcov.info '/usr/*' '*/unit/*' --output-file lcov.info
       - bash $COV_SCRIPT -t "$CODECOV_TOKEN" -f lcov.info -c -F jbmcreg|| true
 cache:
   paths: