diff options
author | Frantisek Sumsal <frantisek@sumsal.cz> | 2019-07-08 21:11:32 +0200 |
---|---|---|
committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2019-07-08 21:11:32 +0200 |
commit | cc469c3dfc398210f38f819d367e68646c71d8da (patch) | |
tree | d997d088b3506e0fbb3503e56d4e472a9b893745 /test/TEST-14-MACHINE-ID | |
parent | 71a0de36e562da72590cdeb625acd4385e7a6e6d (diff) | |
download | systemd-cc469c3dfc398210f38f819d367e68646c71d8da.tar.gz |
test: drop || return 1 expression which is incompatible with set -e
The `set -e` option is incompatible with a subshell/compound command,
which is followed by || <EXPR>. In such case, the -e option is ignored
in all affected subshells/functions (see man bash(1) for command `set`).
Diffstat (limited to 'test/TEST-14-MACHINE-ID')
-rwxr-xr-x | test/TEST-14-MACHINE-ID/test.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/TEST-14-MACHINE-ID/test.sh b/test/TEST-14-MACHINE-ID/test.sh index 33e311a1e7..c22fc7c3c0 100755 --- a/test/TEST-14-MACHINE-ID/test.sh +++ b/test/TEST-14-MACHINE-ID/test.sh @@ -73,7 +73,7 @@ EOF chmod +x $initdir/test-machine-id-setup.sh setup_testsuite - ) || return 1 + ) # mask some services that we do not want to run in these tests ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service |