summaryrefslogtreecommitdiff
path: root/test/TEST-25-IMPORT/test.sh
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-12-10 09:10:28 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-03-28 11:46:47 +0100
commit6e796683dff0fadbc035f6a218fd1230d725b7ac (patch)
tree06348563c09df5a82c02b24ab40c52e5d6cefd6f /test/TEST-25-IMPORT/test.sh
parentf4c40fd75416d00af0b4d115277ad5529c378aa3 (diff)
downloadsystemd-6e796683dff0fadbc035f6a218fd1230d725b7ac.tar.gz
test: move TEST-25-IMPORT setup to static files
Also run mask_supporting_services() here.
Diffstat (limited to 'test/TEST-25-IMPORT/test.sh')
-rwxr-xr-xtest/TEST-25-IMPORT/test.sh17
1 files changed, 2 insertions, 15 deletions
diff --git a/test/TEST-25-IMPORT/test.sh b/test/TEST-25-IMPORT/test.sh
index 14265cdfc5..977f984bd3 100755
--- a/test/TEST-25-IMPORT/test.sh
+++ b/test/TEST-25-IMPORT/test.sh
@@ -12,22 +12,9 @@ test_setup() {
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
- dracut_install dd gunzip mv tar diff
-
- # setup the testsuite service
- cat >$initdir/etc/systemd/system/testsuite.service <<EOF
-[Unit]
-Description=Testsuite service
-
-[Service]
-ExecStart=/testsuite.sh
-Type=oneshot
-EOF
- cp testsuite.sh $initdir/
-
- setup_testsuite
+ mask_supporting_services
)
setup_nspawn_root
}
-do_test "$@"
+do_test "$@" 25