diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-12-10 09:49:08 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-28 11:46:47 +0100 |
| commit | 01efa07960c2200ce89e9d25f29869478c1e9520 (patch) | |
| tree | 4dbb23cfc3cf4a395c10d9acc70053fa79832b68 /test | |
| parent | ff978cd24a9c60d859d89997e2650aca4fe7dee2 (diff) | |
| download | systemd-01efa07960c2200ce89e9d25f29869478c1e9520.tar.gz | |
test: move TEST-34-DYNAMICUSERMIGRATE setup to static files
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-34-DYNAMICUSERMIGRATE/test.sh | 15 | ||||
| -rw-r--r-- | test/units/testsuite-34.service | 6 | ||||
| -rwxr-xr-x | test/units/testsuite-34.sh (renamed from test/TEST-34-DYNAMICUSERMIGRATE/testsuite.sh) | 0 |
3 files changed, 7 insertions, 14 deletions
diff --git a/test/TEST-34-DYNAMICUSERMIGRATE/test.sh b/test/TEST-34-DYNAMICUSERMIGRATE/test.sh index ad299df420..97c8ab4350 100755 --- a/test/TEST-34-DYNAMICUSERMIGRATE/test.sh +++ b/test/TEST-34-DYNAMICUSERMIGRATE/test.sh @@ -13,21 +13,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=/bin/bash -x /testsuite.sh -Type=oneshot -EOF - cp testsuite.sh $initdir/ - - setup_testsuite ) setup_nspawn_root } -do_test "$@" +do_test "$@" 34 diff --git a/test/units/testsuite-34.service b/test/units/testsuite-34.service new file mode 100644 index 0000000000..d7051d450c --- /dev/null +++ b/test/units/testsuite-34.service @@ -0,0 +1,6 @@ +[Unit] +Description=TEST-34-DYNAMICUSERMIGRATE + +[Service] +ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh +Type=oneshot diff --git a/test/TEST-34-DYNAMICUSERMIGRATE/testsuite.sh b/test/units/testsuite-34.sh index 6d9488688a..6d9488688a 100755 --- a/test/TEST-34-DYNAMICUSERMIGRATE/testsuite.sh +++ b/test/units/testsuite-34.sh |