test: de-duplicate test_setup() functions

Now we will run setup_nspawn_root() in some case where do don't need to.

37 files changed, 19 insertions, 486 deletions

diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh
index 8b12e5ba9d..33a1fb6fd0 100755
--- a/test/TEST-03-JOBS/test.sh
+++ b/test/TEST-03-JOBS/test.sh
@@ -5,18 +5,4 @@ TEST_NO_QEMU=1
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 03
diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh
index 868ac28aa1..f16543c2b4 100755
--- a/test/TEST-04-JOURNAL/test.sh
+++ b/test/TEST-04-JOURNAL/test.sh
@@ -4,18 +4,4 @@ TEST_DESCRIPTION="Journal-related tests"
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 04
diff --git a/test/TEST-05-RLIMITS/test.sh b/test/TEST-05-RLIMITS/test.sh
index 6412188ef2..463fe42a7c 100755
--- a/test/TEST-05-RLIMITS/test.sh
+++ b/test/TEST-05-RLIMITS/test.sh
@@ -4,18 +4,4 @@ TEST_DESCRIPTION="Resource limits-related tests"
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 05
diff --git a/test/TEST-07-ISSUE-1981/test.sh b/test/TEST-07-ISSUE-1981/test.sh
index 3495951bfa..5da24a987c 100755
--- a/test/TEST-07-ISSUE-1981/test.sh
+++ b/test/TEST-07-ISSUE-1981/test.sh
@@ -7,18 +7,4 @@ TEST_NO_QEMU=1
 
 NSPAWN_TIMEOUT=30
 
-test_setup() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 07
diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh
index 753a4a9868..a4d155be1d 100755
--- a/test/TEST-09-ISSUE-2691/test.sh
+++ b/test/TEST-09-ISSUE-2691/test.sh
@@ -6,17 +6,4 @@ TEST_NO_NSPAWN=1
 . $TEST_BASE_DIR/test-functions
 QEMU_TIMEOUT=300
 
-test_setup() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-}
-
 do_test "$@" 09
diff --git a/test/TEST-10-ISSUE-2467/test.sh b/test/TEST-10-ISSUE-2467/test.sh
index 4cd7adf6bb..14ded56ba1 100755
--- a/test/TEST-10-ISSUE-2467/test.sh
+++ b/test/TEST-10-ISSUE-2467/test.sh
@@ -4,18 +4,4 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2467"
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 10
diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh
index 0fe0eaeed1..da003c90d5 100755
--- a/test/TEST-11-ISSUE-3166/test.sh
+++ b/test/TEST-11-ISSUE-3166/test.sh
@@ -5,17 +5,4 @@ TEST_NO_NSPAWN=1
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-}
-
 do_test "$@" 11
diff --git a/test/TEST-12-ISSUE-3171/test.sh b/test/TEST-12-ISSUE-3171/test.sh
index c78fe525c3..c8abefbd86 100755
--- a/test/TEST-12-ISSUE-3171/test.sh
+++ b/test/TEST-12-ISSUE-3171/test.sh
@@ -5,19 +5,4 @@ TEST_NO_QEMU=1
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-
-    setup_nspawn_root
-}
-
 do_test "$@" 12
diff --git a/test/TEST-15-DROPIN/test.sh b/test/TEST-15-DROPIN/test.sh
index 42d6c3dd79..1540e2e1f1 100755
--- a/test/TEST-15-DROPIN/test.sh
+++ b/test/TEST-15-DROPIN/test.sh
@@ -5,13 +5,4 @@ TEST_NO_QEMU=1
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    # create the basic filesystem layout
-    setup_basic_environment
-    mask_supporting_services
-
-    # create dedicated rootfs for nspawn (located in $TESTDIR/nspawn-root)
-    setup_nspawn_root
-}
-
 do_test "$@" 15
diff --git a/test/TEST-16-EXTEND-TIMEOUT/test.sh b/test/TEST-16-EXTEND-TIMEOUT/test.sh
index 474b9db2fc..e1e2a68fa9 100755
--- a/test/TEST-16-EXTEND-TIMEOUT/test.sh
+++ b/test/TEST-16-EXTEND-TIMEOUT/test.sh
@@ -6,18 +6,4 @@ TEST_NO_QEMU=1
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-
-    setup_nspawn_root
-}
-
 do_test "$@" 16
diff --git a/test/TEST-17-UDEV-WANTS/test.sh b/test/TEST-17-UDEV-WANTS/test.sh
index a5a2eb3d29..5b8f22cbaa 100755
--- a/test/TEST-17-UDEV-WANTS/test.sh
+++ b/test/TEST-17-UDEV-WANTS/test.sh
@@ -6,16 +6,4 @@ TEST_NO_NSPAWN=1
 . $TEST_BASE_DIR/test-functions
 QEMU_TIMEOUT=300
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-}
-
 do_test "$@" 17
diff --git a/test/TEST-18-FAILUREACTION/test.sh b/test/TEST-18-FAILUREACTION/test.sh
index a9315466f9..5c386b8ea2 100755
--- a/test/TEST-18-FAILUREACTION/test.sh
+++ b/test/TEST-18-FAILUREACTION/test.sh
@@ -5,18 +5,4 @@ TEST_DESCRIPTION="FailureAction= operation"
 . $TEST_BASE_DIR/test-functions
 QEMU_TIMEOUT=600
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-
-    setup_nspawn_root
-}
-
 do_test "$@" 18
diff --git a/test/TEST-19-DELEGATE/test.sh b/test/TEST-19-DELEGATE/test.sh
index 872df15615..03c7760bfd 100755
--- a/test/TEST-19-DELEGATE/test.sh
+++ b/test/TEST-19-DELEGATE/test.sh
@@ -7,16 +7,4 @@ TEST_NO_NSPAWN=1
 QEMU_TIMEOUT=600
 UNIFIED_CGROUP_HIERARCHY=yes
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-}
-
 do_test "$@" 19
diff --git a/test/TEST-20-MAINPIDGAMES/test.sh b/test/TEST-20-MAINPIDGAMES/test.sh
index d6abbadb2b..50724b3f3c 100755
--- a/test/TEST-20-MAINPIDGAMES/test.sh
+++ b/test/TEST-20-MAINPIDGAMES/test.sh
@@ -4,18 +4,4 @@ TEST_DESCRIPTION="test changing main PID"
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-
-    setup_nspawn_root
-}
-
 do_test "$@" 20
diff --git a/test/TEST-22-TMPFILES/test.sh b/test/TEST-22-TMPFILES/test.sh
index 5ab688e4ac..317e4a88f7 100755
--- a/test/TEST-22-TMPFILES/test.sh
+++ b/test/TEST-22-TMPFILES/test.sh
@@ -2,16 +2,6 @@
 set -e
 TEST_DESCRIPTION="Tmpfiles related tests"
 TEST_NO_QEMU=1
-
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    # create the basic filesystem layout
-    setup_basic_environment
-    mask_supporting_services
-
-    # create dedicated rootfs for nspawn (located in $TESTDIR/nspawn-root)
-    setup_nspawn_root
-}
-
 do_test "$@" 22
diff --git a/test/TEST-23-TYPE-EXEC/test.sh b/test/TEST-23-TYPE-EXEC/test.sh
index bafbef0319..1b0d25a721 100755
--- a/test/TEST-23-TYPE-EXEC/test.sh
+++ b/test/TEST-23-TYPE-EXEC/test.sh
@@ -1,20 +1,6 @@
 #!/usr/bin/env bash
 set -e
 TEST_DESCRIPTION="test Type=exec"
-
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 23
diff --git a/test/TEST-24-UNIT-TESTS/test.sh b/test/TEST-24-UNIT-TESTS/test.sh
index 7b07a9ee5c..06b6cebf4f 100755
--- a/test/TEST-24-UNIT-TESTS/test.sh
+++ b/test/TEST-24-UNIT-TESTS/test.sh
@@ -52,23 +52,4 @@ check_result_qemu() {
     return $_ret
 }
 
-test_setup() {
-    if type -P meson && [[ "$(meson configure $BUILD_DIR | grep install-tests | awk '{ print $2 }')" != "true" ]]; then
-        dfatal "Needs to be built with -Dinstall-tests=true"
-        exit 1
-    fi
-
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 24
diff --git a/test/TEST-25-IMPORT/test.sh b/test/TEST-25-IMPORT/test.sh
index 977f984bd3..034b94ca79 100755
--- a/test/TEST-25-IMPORT/test.sh
+++ b/test/TEST-25-IMPORT/test.sh
@@ -4,17 +4,4 @@ TEST_DESCRIPTION="test importd"
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 25
diff --git a/test/TEST-26-SETENV/test.sh b/test/TEST-26-SETENV/test.sh
index 7b71fcda3a..158fa6fdc0 100755
--- a/test/TEST-26-SETENV/test.sh
+++ b/test/TEST-26-SETENV/test.sh
@@ -4,17 +4,4 @@ TEST_DESCRIPTION="test setenv"
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 26
diff --git a/test/TEST-27-STDOUTFILE/test.sh b/test/TEST-27-STDOUTFILE/test.sh
index 80c4b0920c..23aadf314e 100755
--- a/test/TEST-27-STDOUTFILE/test.sh
+++ b/test/TEST-27-STDOUTFILE/test.sh
@@ -4,17 +4,4 @@ TEST_DESCRIPTION="test StandardOutput=file:"
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 27
diff --git a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh
index 477eb15cbe..09baf22776 100755
--- a/test/TEST-28-PERCENTJ-WANTEDBY/test.sh
+++ b/test/TEST-28-PERCENTJ-WANTEDBY/test.sh
@@ -5,18 +5,4 @@ RUN_IN_UNPRIVILEGED_CONTAINER=yes
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 28
diff --git a/test/TEST-29-UDEV-ID_RENAMING/test.sh b/test/TEST-29-UDEV-ID_RENAMING/test.sh
index b266ff9e56..4feafc04d7 100755
--- a/test/TEST-29-UDEV-ID_RENAMING/test.sh
+++ b/test/TEST-29-UDEV-ID_RENAMING/test.sh
@@ -6,16 +6,4 @@ TEST_NO_NSPAWN=1
 . $TEST_BASE_DIR/test-functions
 QEMU_TIMEOUT=300
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-}
-
 do_test "$@" 29
diff --git a/test/TEST-30-ONCLOCKCHANGE/test.sh b/test/TEST-30-ONCLOCKCHANGE/test.sh
index 5b4133202f..4723e7b0be 100755
--- a/test/TEST-30-ONCLOCKCHANGE/test.sh
+++ b/test/TEST-30-ONCLOCKCHANGE/test.sh
@@ -2,19 +2,6 @@
 set -e
 TEST_DESCRIPTION="test OnClockChange= + OnTimezoneChange="
 TEST_NO_NSPAWN=1
-
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-}
-
 do_test "$@" 30
diff --git a/test/TEST-31-DEVICE-ENUMERATION/test.sh b/test/TEST-31-DEVICE-ENUMERATION/test.sh
index b2565e0c96..4fbd38d2d0 100755
--- a/test/TEST-31-DEVICE-ENUMERATION/test.sh
+++ b/test/TEST-31-DEVICE-ENUMERATION/test.sh
@@ -6,16 +6,4 @@ TEST_NO_NSPAWN=1
 . $TEST_BASE_DIR/test-functions
 QEMU_TIMEOUT=300
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-}
-
 do_test "$@" 31
diff --git a/test/TEST-32-OOMPOLICY/test.sh b/test/TEST-32-OOMPOLICY/test.sh
index 32fac7a289..6f2955cf62 100755
--- a/test/TEST-32-OOMPOLICY/test.sh
+++ b/test/TEST-32-OOMPOLICY/test.sh
@@ -2,21 +2,8 @@
 set -e
 TEST_DESCRIPTION="test OOM killer logic"
 TEST_NO_NSPAWN=1
-
 . $TEST_BASE_DIR/test-functions
 
 UNIFIED_CGROUP_HIERARCHY=yes
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-}
-
 do_test "$@" 32
diff --git a/test/TEST-33-CLEAN-UNIT/test.sh b/test/TEST-33-CLEAN-UNIT/test.sh
index fe2458b170..64cb6aee59 100755
--- a/test/TEST-33-CLEAN-UNIT/test.sh
+++ b/test/TEST-33-CLEAN-UNIT/test.sh
@@ -3,20 +3,6 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 set -e
 TEST_DESCRIPTION="test CleanUnit"
-
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 33
diff --git a/test/TEST-34-DYNAMICUSERMIGRATE/test.sh b/test/TEST-34-DYNAMICUSERMIGRATE/test.sh
index 97c8ab4350..0b2174a894 100755
--- a/test/TEST-34-DYNAMICUSERMIGRATE/test.sh
+++ b/test/TEST-34-DYNAMICUSERMIGRATE/test.sh
@@ -1,20 +1,6 @@
 #!/usr/bin/env bash
 set -e
 TEST_DESCRIPTION="test migrating state directory from DynamicUser=1 to DynamicUser=0 and back"
-
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 34
diff --git a/test/TEST-36-NUMAPOLICY/test.sh b/test/TEST-36-NUMAPOLICY/test.sh
index 1956d5271d..02f013568c 100755
--- a/test/TEST-36-NUMAPOLICY/test.sh
+++ b/test/TEST-36-NUMAPOLICY/test.sh
@@ -4,19 +4,6 @@ set -e
 TEST_DESCRIPTION="test MUMAPolicy= and NUMAMask= options"
 TEST_NO_NSPAWN=1
 QEMU_OPTIONS="-numa node,nodeid=0"
-
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-}
-
 do_test "$@" 36
diff --git a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh
index 44f77bc6a0..b5806c429f 100755
--- a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh
+++ b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh
@@ -3,20 +3,6 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 set -e
 TEST_DESCRIPTION="test RuntimeDirectoryPreserve=yes"
-
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 37
diff --git a/test/TEST-39-EXECRELOAD/test.sh b/test/TEST-39-EXECRELOAD/test.sh
index 35cabff5ea..e38a9902ce 100755
--- a/test/TEST-39-EXECRELOAD/test.sh
+++ b/test/TEST-39-EXECRELOAD/test.sh
@@ -1,21 +1,6 @@
 #!/usr/bin/env bash
 set -e
 TEST_DESCRIPTION="Test ExecReload= (PR #13098)"
-
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    # Create what will eventually be our root filesystem onto an overlay
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 39
diff --git a/test/TEST-40-EXEC-COMMAND-EX/test.sh b/test/TEST-40-EXEC-COMMAND-EX/test.sh
index eae4e37c96..4ee84d4d35 100755
--- a/test/TEST-40-EXEC-COMMAND-EX/test.sh
+++ b/test/TEST-40-EXEC-COMMAND-EX/test.sh
@@ -1,20 +1,6 @@
 #!/usr/bin/env bash
 set -e
 TEST_DESCRIPTION="test ExecXYZEx= service unit dbus hookups"
-
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 40
diff --git a/test/TEST-41-ONESHOT-RESTART/test.sh b/test/TEST-41-ONESHOT-RESTART/test.sh
index c94d181a30..d3f96ae107 100755
--- a/test/TEST-41-ONESHOT-RESTART/test.sh
+++ b/test/TEST-41-ONESHOT-RESTART/test.sh
@@ -3,17 +3,4 @@ set -e
 TEST_DESCRIPTION="Test oneshot unit restart on failure"
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 41
diff --git a/test/TEST-42-EXECSTOPPOST/test.sh b/test/TEST-42-EXECSTOPPOST/test.sh
index e143fb6288..53e6fa3dd0 100755
--- a/test/TEST-42-EXECSTOPPOST/test.sh
+++ b/test/TEST-42-EXECSTOPPOST/test.sh
@@ -4,17 +4,4 @@ TEST_DESCRIPTION="test that ExecStopPost= is always run"
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 42
diff --git a/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh b/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh
index 4eed8242fd..4749150ff1 100755
--- a/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh
+++ b/test/TEST-43-PRIVATEUSER-UNPRIV/test.sh
@@ -3,19 +3,6 @@ set -e
 TEST_DESCRIPTION="Test PrivateUsers=yes on user manager"
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 has_user_dbus_socket || exit 0
 
 do_test "$@" 43
diff --git a/test/TEST-44-LOG-NAMESPACE/test.sh b/test/TEST-44-LOG-NAMESPACE/test.sh
index 2ef0c244ac..26d863708e 100755
--- a/test/TEST-44-LOG-NAMESPACE/test.sh
+++ b/test/TEST-44-LOG-NAMESPACE/test.sh
@@ -4,17 +4,4 @@ TEST_DESCRIPTION="test log namespaces"
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image_rootdir
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    )
-    setup_nspawn_root
-}
-
 do_test "$@" 44
diff --git a/test/TEST-46-HOMED/test.sh b/test/TEST-46-HOMED/test.sh
index 5e87cf6143..877cbfefd0 100755
--- a/test/TEST-46-HOMED/test.sh
+++ b/test/TEST-46-HOMED/test.sh
@@ -5,22 +5,4 @@ TEST_NO_QEMU=1
 
 . $TEST_BASE_DIR/test-functions
 
-test_setup() {
-    create_empty_image
-    mkdir -p $TESTDIR/root
-    mount ${LOOPDEV}p1 $TESTDIR/root
-
-    (
-        LOG_LEVEL=5
-        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
-
-        setup_basic_environment
-        mask_supporting_services
-    ) || return 1
-    setup_nspawn_root
-
-    ddebug "umount $TESTDIR/root"
-    umount $TESTDIR/root
-}
-
 do_test "$@" 46
diff --git a/test/test-functions b/test/test-functions
index 47ffba8fd6..827337a814 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -1893,6 +1893,25 @@ test_cleanup() {
     _test_cleanup
 }
 
+test_setup() {
+    if type -P meson && [[ "$(meson configure $BUILD_DIR | grep install-tests | awk '{ print $2 }')" != "true" ]]; then
+        dfatal "Needs to be built with -Dinstall-tests=true"
+        exit 1
+    fi
+
+    create_empty_image_rootdir
+
+    # Create what will eventually be our root filesystem onto an overlay
+    (
+        LOG_LEVEL=5
+        eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
+
+        setup_basic_environment
+        mask_supporting_services
+    )
+    setup_nspawn_root
+}
+
 test_run() {
     if [ -z "$TEST_NO_QEMU" ]; then
         if run_qemu "$1"; then