test: collect coverage in a couple more codepaths

Otherwise we'd miss coverage from TEST-{02,24,61}, since they don't go
through the "standard" `check_result_common` hook.

Follow-up to 7bf20e48bd7d641a39a14a7feb749b7e8b0fc0f6.

diff --git a/test/TEST-24-CRYPTSETUP/test.sh b/test/TEST-24-CRYPTSETUP/test.sh
index 2dd0d4ca7f0c184664f14695428525e7b9b935c3..68a54924a456116f5a2b228978b2ae986c9914cc 100755 (executable)
--- a/test/TEST-24-CRYPTSETUP/test.sh
+++ b/test/TEST-24-CRYPTSETUP/test.sh
@@ -28,6 +28,7 @@ check_result_qemu() {
     echo "${JOURNAL_LIST:-No journals were saved}"
 
     test -s "$TESTDIR/failed" && ret=1
+    check_coverage_reports "${initdir:?}" || ret=5
     return $ret
 }
 

diff --git a/test/test-functions b/test/test-functions
index bb205cd31feda44b40588db29651d2ccff2240dc..2557d15c0486f7eda59bd6b9238ac8dda4c09e20 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -1458,6 +1458,7 @@ check_result_nspawn_unittests() {
     fi
 
     get_bool "${TIMED_OUT:=}" && ret=1
+    check_coverage_reports "$workspace" || ret=5
 
     save_journal "$workspace/var/log/journal" $ret
 
@@ -1490,6 +1491,7 @@ check_result_qemu_unittests() {
     fi
 
     get_bool "${TIMED_OUT:=}" && ret=1
+    check_coverage_reports "$initdir" || ret=5
 
     save_journal "$initdir/var/log/journal" $ret