test: Factorize common integration test functions (#6540)

All test/TEST* but TEST-02-CRYPTSETUP share the same check_result_qemu()
and test_cleanup(), so move them into test_functions and only override
them in TEST-02-CRYPTSETUP.

Also provide a common test_run() which by default assumes that both QEMU
and nspawn tests are run. Particular tests which don't support either
need to explicitly opt out by setting $TEST_NO_{QEMU,NSPAWN}. Do it this
way around to avoid accidentally forgetting to opt in, and to encourage
test authors to at least always support nspawn.

1 files changed, 1 insertions, 13 deletions

diff --git a/test/TEST-15-DROPIN/test.sh b/test/TEST-15-DROPIN/test.sh
index 1b460db7b..536b379f6 100755
--- a/test/TEST-15-DROPIN/test.sh
+++ b/test/TEST-15-DROPIN/test.sh
@@ -3,22 +3,10 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
 TEST_DESCRIPTION="Dropin tests"
+TEST_NO_QEMU=1
 
 . $TEST_BASE_DIR/test-functions
 
-
-test_run_nspawn() {
-        if ! run_nspawn; then
-                dwarn "can't run systemd-nspawn, skipping"
-                return 0
-        fi
-        check_result_nspawn
-}
-
-test_run() {
-        test_run_nspawn || return
-}
-
 test_setup() {
         # create the basic filesystem layout
         setup_basic_environment >/dev/null