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 /test/TEST-31-DEVICE-ENUMERATION | |
| parent | 7eeeab205d8066d3516b2bc552ff87a72eab824e (diff) | |
| download | systemd-048d52d51ee5413b2376cfa21ec153510c7e766b.tar.gz | |
test: move TEST-31-DEVICE-ENUMERATION setup to static files
Diffstat (limited to 'test/TEST-31-DEVICE-ENUMERATION')
| -rwxr-xr-x | test/TEST-31-DEVICE-ENUMERATION/test.sh | 15 | ||||
| -rwxr-xr-x | test/TEST-31-DEVICE-ENUMERATION/testsuite.sh | 10 |
2 files changed, 1 insertions, 24 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/TEST-31-DEVICE-ENUMERATION/testsuite.sh b/test/TEST-31-DEVICE-ENUMERATION/testsuite.sh deleted file mode 100755 index fcff82d804..0000000000 --- a/test/TEST-31-DEVICE-ENUMERATION/testsuite.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env bash -set -e -set -o pipefail - -if journalctl -b -t systemd --grep '\.device: Changed plugged -> dead'; then - exit 1 -fi - -echo OK > /testok -exit 0 |