test: filter the merged coverage report instead

So we don't have to do this twice - once for the base report and then
for each "real" one.

Follow-up to 7fdd6e157a.

diff --git a/test/test-functions b/test/test-functions
index 7eb0e8e2e31f2521b44704c0b35e4888850cd553..644410d7bc66351f84db23789bac11b9accac328 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -1498,7 +1498,6 @@ check_coverage_reports() {
     # Create a coverage report that will later be uploaded. Remove info about
     # system libraries/headers, as we don't really care about them.
     lcov --directory "${root}/${BUILD_DIR:?}" --capture --output-file "${dest}.new"
-    lcov --remove "${dest}.new" -o "${dest}.new" '/usr/include/*' '/usr/lib/*'
     if [[ -f "$dest" ]]; then
         # If the destination report file already exists, don't overwrite it, but
         # merge it with the already present one - this usually happens when
@@ -1509,6 +1508,7 @@ check_coverage_reports() {
         # report we did during the setup phase (see test_setup()).
         lcov --add-tracefile "${TESTDIR:?}/coverage-base" --add-tracefile "${dest}.new" -o "${dest}"
     fi
+    lcov --remove "$dest" -o "$dest" '/usr/include/*' '/usr/lib/*'
     rm -f "${dest}.new"
 
     # If the test logs contain lines like: