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.
This commit is contained in:
Frantisek Sumsal 2023-03-25 14:39:13 +01:00
parent 7fdd6e157a
commit 237d81fdb3

View file

@ -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: