diff options
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-46-HOMED/test.sh | 18 | ||||
| -rw-r--r-- | test/units/testsuite-46.service | 9 | ||||
| -rwxr-xr-x | test/units/testsuite-46.sh (renamed from test/TEST-46-HOMED/testsuite.sh) | 0 |
3 files changed, 10 insertions, 17 deletions
diff --git a/test/TEST-46-HOMED/test.sh b/test/TEST-46-HOMED/test.sh index 99fd5b85b8..5e87cf6143 100755 --- a/test/TEST-46-HOMED/test.sh +++ b/test/TEST-46-HOMED/test.sh @@ -16,22 +16,6 @@ test_setup() { setup_basic_environment mask_supporting_services - - # setup the testsuite service - cat >$initdir/etc/systemd/system/testsuite.service <<EOF -[Unit] -Description=Testsuite service -Before=getty-pre.target -Wants=getty-pre.target - -[Service] -ExecStart=/bin/bash -x /testsuite.sh -Type=oneshot -NotifyAccess=all -EOF - cp testsuite.sh $initdir/ - - setup_testsuite ) || return 1 setup_nspawn_root @@ -39,4 +23,4 @@ EOF umount $TESTDIR/root } -do_test "$@" +do_test "$@" 46 diff --git a/test/units/testsuite-46.service b/test/units/testsuite-46.service new file mode 100644 index 0000000000..46e9a618e2 --- /dev/null +++ b/test/units/testsuite-46.service @@ -0,0 +1,9 @@ +[Unit] +Description=TEST-46-HOMED +Before=getty-pre.target +Wants=getty-pre.target + +[Service] +ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh +Type=oneshot +NotifyAccess=all diff --git a/test/TEST-46-HOMED/testsuite.sh b/test/units/testsuite-46.sh index 9ef9f30f1e..9ef9f30f1e 100755 --- a/test/TEST-46-HOMED/testsuite.sh +++ b/test/units/testsuite-46.sh |