diff options
Diffstat (limited to '')
| -rwxr-xr-x | test/TEST-41-ONESHOT-RESTART/test.sh | 15 | ||||
| -rw-r--r-- | test/units/testsuite-41.service | 6 | ||||
| -rwxr-xr-x | test/units/testsuite-41.sh (renamed from test/TEST-41-ONESHOT-RESTART/testsuite.sh) | 0 |
3 files changed, 7 insertions, 14 deletions
diff --git a/test/TEST-41-ONESHOT-RESTART/test.sh b/test/TEST-41-ONESHOT-RESTART/test.sh index 54292c0ca2..c94d181a30 100755 --- a/test/TEST-41-ONESHOT-RESTART/test.sh +++ b/test/TEST-41-ONESHOT-RESTART/test.sh @@ -12,21 +12,8 @@ test_setup() { setup_basic_environment mask_supporting_services - - # 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 ) setup_nspawn_root } -do_test "$@" +do_test "$@" 41 diff --git a/test/units/testsuite-41.service b/test/units/testsuite-41.service new file mode 100644 index 0000000000..bf0b0db6a2 --- /dev/null +++ b/test/units/testsuite-41.service @@ -0,0 +1,6 @@ +[Unit] +Description=TEST-41-ONESHOT-RESTART + +[Service] +ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh +Type=oneshot diff --git a/test/TEST-41-ONESHOT-RESTART/testsuite.sh b/test/units/testsuite-41.sh index 905f32e994..905f32e994 100755 --- a/test/TEST-41-ONESHOT-RESTART/testsuite.sh +++ b/test/units/testsuite-41.sh |