test: move TEST-26-SETENV setup to static files

Also run mask_supporting_services() here.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-12-10 09:13:20 +01:00
parent 68e2dc0f91
commit dfa633ca6a
3 changed files with 8 additions and 14 deletions

View File

@ -12,21 +12,9 @@ test_setup() {
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
# setup the testsuite service
cat >$initdir/etc/systemd/system/testsuite.service <<EOF
[Unit]
Description=Testsuite service
[Service]
ExecStart=/bin/bash -x /testsuite.sh
Type=oneshot
EOF
cp testsuite.sh $initdir/
setup_testsuite
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@"
do_test "$@" 26

View File

@ -0,0 +1,6 @@
[Unit]
Description=TEST-26-SETENV
[Service]
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot