diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-12-10 09:41:07 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-28 11:46:47 +0100 |
| commit | 048d52d51ee5413b2376cfa21ec153510c7e766b (patch) | |
| tree | 158cd4b3896ce544214bae7b5e7bbb1d6c4dc429 | |
| parent | test: move TEST-30-ONCLOCKCHANGE setup to static files (diff) | |
| download | systemd-048d52d51ee5413b2376cfa21ec153510c7e766b.tar.xz systemd-048d52d51ee5413b2376cfa21ec153510c7e766b.zip | |
test: move TEST-31-DEVICE-ENUMERATION setup to static files
| -rwxr-xr-x | test/TEST-31-DEVICE-ENUMERATION/test.sh | 15 | ||||
| -rw-r--r-- | test/units/testsuite-31.service | 6 | ||||
| -rwxr-xr-x | test/units/testsuite-31.sh (renamed from test/TEST-31-DEVICE-ENUMERATION/testsuite.sh) | 0 |
3 files changed, 7 insertions, 14 deletions
diff --git a/test/TEST-31-DEVICE-ENUMERATION/test.sh b/test/TEST-31-DEVICE-ENUMERATION/test.sh index 7bc9298dc1..b2565e0c96 100755 --- a/test/TEST-31-DEVICE-ENUMERATION/test.sh +++ b/test/TEST-31-DEVICE-ENUMERATION/test.sh @@ -15,20 +15,7 @@ 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 ) } -do_test "$@" +do_test "$@" 31 diff --git a/test/units/testsuite-31.service b/test/units/testsuite-31.service new file mode 100644 index 0000000000..26ec2cb5cd --- /dev/null +++ b/test/units/testsuite-31.service @@ -0,0 +1,6 @@ +[Unit] +Description=TEST-31-DEVICE-ENUMERATION + +[Service] +ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh +Type=oneshot diff --git a/test/TEST-31-DEVICE-ENUMERATION/testsuite.sh b/test/units/testsuite-31.sh index fcff82d804..fcff82d804 100755 --- a/test/TEST-31-DEVICE-ENUMERATION/testsuite.sh +++ b/test/units/testsuite-31.sh |