diff --git a/test/TEST-10-ISSUE-2467/test.sh b/test/TEST-10-ISSUE-2467/test.sh index b510627a70..8dabf3f2b6 100755 --- a/test/TEST-10-ISSUE-2467/test.sh +++ b/test/TEST-10-ISSUE-2467/test.sh @@ -7,4 +7,16 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2467" # shellcheck source=test/test-functions . "${TEST_BASE_DIR:?}/test-functions" +test_append_files() { + ( + # Collecting coverage slows this particular test quite a bit, causing + # it to fail with the default settings (20 triggers per 2 secs) + # to trip over the default limit. Let's help it a bit in such case. + if get_bool "$IS_BUILT_WITH_COVERAGE"; then + mkdir -p "${initdir:?}/etc/systemd/system/test10.socket.d" + printf "[Socket]\nTriggerLimitIntervalSec=10\n" >"${initdir:?}/etc/systemd/system/test10.socket.d/coverage-override.conf" + fi + ) +} + do_test "$@" diff --git a/test/test-functions b/test/test-functions index cd9d01f345..79a7f5a71c 100644 --- a/test/test-functions +++ b/test/test-functions @@ -1316,8 +1316,19 @@ 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}" - lcov --remove "${dest}" -o "${dest}" '/usr/include/*' '/usr/lib/*' + if [[ -f "$dest" ]]; then + # If the destination report file already exists, don't overwrite it, but + # dump the new report in a temporary file and then merge it with the already + # present one - this usually happens when running both "parts" of a test + # in one run (the qemu and the nspawn part). + lcov --directory "${root}/${BUILD_DIR:?}" --capture --output-file "${dest}.new" + lcov --remove "${dest}.new" -o "${dest}.new" '/usr/include/*' '/usr/lib/*' + lcov --add-tracefile "${dest}" --add-tracefile "${dest}.new" -o "${dest}" + rm -f "${dest}.new" + else + lcov --directory "${root}/${BUILD_DIR:?}" --capture --output-file "${dest}" + lcov --remove "${dest}" -o "${dest}" '/usr/include/*' '/usr/lib/*' + fi return 0 }