summaryrefslogtreecommitdiff
path: root/test/TEST-24-UNIT-TESTS
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-12-10 16:40:31 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-28 11:51:11 +0100
commit70ce817ccbd18cab761a72d54c0a115f34b4b151 (patch)
treea2d72fee7ae0d7b22943a49ca28b6e48799f9d6f /test/TEST-24-UNIT-TESTS
parentbdfa9657d0aaba7d23757f690265b1665f9ff9ec (diff)
downloadsystemd-70ce817ccbd18cab761a72d54c0a115f34b4b151.tar.gz
test: de-duplicate test_setup() functions
Now we will run setup_nspawn_root() in some case where do don't need to.
Diffstat (limited to 'test/TEST-24-UNIT-TESTS')
-rwxr-xr-xtest/TEST-24-UNIT-TESTS/test.sh19
1 files changed, 0 insertions, 19 deletions
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