diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-10-08 11:11:49 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-10-08 11:11:49 +0200 |
| commit | fd3561bae0097fab3df79d30b2f171169d75258a (patch) | |
| tree | 3ca415419d31270d45e41c8ffefcc35c563d5f93 /test | |
| parent | 51fa85913c4d1826414c6fa5a2e235f65425d91a (diff) | |
| download | systemd-fd3561bae0097fab3df79d30b2f171169d75258a.tar.gz | |
test/TEST-31-DEVICE-ENUMERATION: do not use -x to avoid grep loop
https://github.com/systemd/systemd/pull/13746#issuecomment-539410752:
> [grep] now matches the grep command itself, as it's logged into journal as well, thanks to set -x.
Also, use journalctl --grep and -t to make things a bit quicker.
Diffstat (limited to 'test')
| -rwxr-xr-x | test/TEST-31-DEVICE-ENUMERATION/testsuite.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/TEST-31-DEVICE-ENUMERATION/testsuite.sh b/test/TEST-31-DEVICE-ENUMERATION/testsuite.sh index aa94d59bd3..047c1be06f 100755 --- a/test/TEST-31-DEVICE-ENUMERATION/testsuite.sh +++ b/test/TEST-31-DEVICE-ENUMERATION/testsuite.sh @@ -1,8 +1,8 @@ #!/bin/bash -set -ex +set -e set -o pipefail -if journalctl -b | grep -e '\.device: Changed plugged -> dead'; then +if journalctl -b -t systemd --grep '\.device: Changed plugged -> dead'; then exit 1 fi |