test: de-duplicate test_setup() functions

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

diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh
index 8b12e5ba9ddf5a66545201bd8121b72151d04ad8..33a1fb6fd09a480bd9fad341e3531eb681084cf4 100755 (executable)
--- 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 868ac28aa107d01f2d9971ac4a5a4d918ac9c3df..f16543c2b44b7ebd7076357af9f2d6f8c7d674d9 100755 (executable)
--- 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 6412188ef279201e9a9bea6ce30b69637d4ad0cb..463fe42a7cf200f78ae5c6d8dc8c540128b682c1 100755 (executable)
--- 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 3495951bfa76b21d34d9a8ac8c712a19fc750be1..5da24a987ce5d5933e555dd99164983a4c492ac1 100755 (executable)
--- 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 753a4a9868f86c2eef4c0c8ccbc53918e0dbb254..a4d155be1db3443b5de823671ba57d017eb9e069 100755 (executable)
--- 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 4cd7adf6bbfc2521dd81cba82245175cb4556ab9..14ded56ba15c938a4bfb84bb1d7396062b5dadb3 100755 (executable)
--- 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 0fe0eaeed147ab800495ffdd39615086dde75710..da003c90d512dc4d0e68468a29dbdea0f4f9fafa 100755 (executable)
--- 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 c78fe525c32754681eb852d6b72ccad741df9e51..c8abefbd866641e0df6206920c241435308d3a36 100755 (executable)
--- 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 42d6c3dd79bb09664baac6bccc5604f843976588..1540e2e1f115dd1803226a367d52444ba8b7939d 100755 (executable)
--- 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 474b9db2fcc03341f9b2876ff8b0e9348d0a8ecb..e1e2a68fa9e009dd651c09f0b6d93d47c0ee1f96 100755 (executable)
--- 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 a5a2eb3d2929cfcf6e743c97f6b8e5ef696967dc..5b8f22cbaae7beea187d3b00122217fc09c2e5e8 100755 (executable)
--- 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 a9315466f93cf64322810bbf31971c6bd37f5ec6..5c386b8ea209aae9079510d15a44bc91fd8ec89a 100755 (executable)
--- 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 872df1561535bf34790fb5d1850f37a2e4be00b8..03c7760bfd14d099ded8f87fd97383a6e68c36c2 100755 (executable)
--- 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 d6abbadb2b584c4ce481a988bceb9b45134a8d99..50724b3f3c0bca3aa19e185ba1167ea5c8211bf5 100755 (executable)
--- 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 5ab688e4ac3c4ea7246416f64017f998892a1d6b..317e4a88f787f78f21f37ee7df6691e68afdce0a 100755 (executable)
--- 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 bafbef0319cefcfeca6a2a92c3ae25ea3aade551..1b0d25a721ba9dbb091575f3edea4b982ff4eeef 100755 (executable)
--- 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 7b07a9ee5cb76ad0f906e33c7bdee579ee30bc05..06b6cebf4fd6b0f7ffea90befa85dfdb1a5b6192 100755 (executable)
--- 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 977f984bd31b84f585fd57f5230ef5c482ceb458..034b94ca7992515df260a9c62331a94943a7b0a9 100755 (executable)
--- 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 7b71fcda3afc140e67f891c569c9e8a2a2d33357..158fa6fdc04ac05330256ce1a5358818c0397650 100755 (executable)
--- 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 80c4b0920c84d4688ff0038afe504fb4cc75926d..23aadf314e11554327833d95a4823acbdb81e413 100755 (executable)
--- 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 477eb15cbec5df425cde4b08b6802b13bb699755..09baf2277683a02e67ef67340e5a14339de2e89f 100755 (executable)
--- 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 b266ff9e56639453ed8779a257d0a34c7e4da0fc..4feafc04d708246c4c659180e9bfa65d666c7075 100755 (executable)
--- 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 5b4133202f36e9aa553706373f75d55b72fa6030..4723e7b0be81921cb3b9edfcefb59d40f8844a4e 100755 (executable)
--- 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 b2565e0c96ef80ead986baeffbf52054ac0ce98c..4fbd38d2d0dadf520dfcd5315952c86e547dfb6b 100755 (executable)
--- 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 32fac7a289a359e594ccc686d8b7f3e2fe9ec631..6f2955cf62c303552d5c3b47fe33a518034a9b88 100755 (executable)
--- 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 fe2458b1705b3f9062d182f2be1fa1e2875e65d6..64cb6aee5938b4e9b548185cfba711dbaa2dc18c 100755 (executable)
--- 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 97c8ab43508bdb14a418b25d8dbb4d841154a9fd..0b2174a894b0b15a0c0dd6d889420f042e5afb0a 100755 (executable)
--- 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 1956d5271d2dbf91dfdd4b6acbf2bd549a91b88d..02f013568cd44f532c873984b9f5b26ec9725140 100755 (executable)
--- 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 44f77bc6a0fd80248207124f214fcc3a58ac00d7..b5806c429f91aae4b18b820370fb72e477559283 100755 (executable)
--- 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 35cabff5ea621492492fc3ebadf0acb85b8cdc94..e38a9902ce072b8d4d186ecb452fd1a17d7dbbae 100755 (executable)
--- 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 eae4e37c963b060c3a7b6d3ee53a6d599019012d..4ee84d4d35ddf7d0c9c167a6545fab482b3f0833 100755 (executable)
--- 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 c94d181a30eef94fc0eea6407cb6cb59bf0106f4..d3f96ae1071a9ffe5020ed72fe6d0e0c7df67d70 100755 (executable)
--- 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 e143fb6288e449f0c3abe77bf8d51476bea16119..53e6fa3dd01da5ea040bb28816c1c211f0e83e03 100755 (executable)
--- 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 4eed8242fd84e53e298be5ebc5ab68ba3f579770..4749150ff125a448f38050741e7526d0ca21b3a3 100755 (executable)
--- 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 2ef0c244ac948f39bebfa38cb532dee4388aaa1b..26d863708e85833115b666f9898139f8c7d8dbea 100755 (executable)
--- 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 5e87cf6143bae89e4c4a1329420a30b9ca7cb4d9..877cbfefd035d02bce12f5037d93588bc32f6dd0 100755 (executable)
--- 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 47ffba8fd66be37ecfaca070f6a66d7af092e070..827337a814b7bb8e7296be1ae97270a8bc864aba 100644 (file)
--- 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