diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-10-02 09:40:11 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-10-08 13:35:26 +0200 |
| commit | af4671cda04446cfea9008b6cedb094d8d6577fd (patch) | |
| tree | b47a2305f941919a2584cd3fad15f2a992a0ef7f | |
| parent | 44bb65485fcb99772925b2d394522b913be02d93 (diff) | |
| download | NetworkManager-af4671cda04446cfea9008b6cedb094d8d6577fd.tar.gz | |
run-nm-test: fix using exec instead of running and exiting
Otherwise, the script tries to run
dbus-run-session -- exec ...
which fails (because `exec` is a shell command, not a program).
After the failure, the code falls through to run the test under
valgrind.
Fixes: 6a58c55ca44a ('run-nm-test: Just use exec instead of running and exiting')
(cherry picked from commit b9c4d2bb72d4aeae256705317fb932cda22d133e)
| -rwxr-xr-x | tools/run-nm-test.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh index 80503bcce5..140236dcb3 100755 --- a/tools/run-nm-test.sh +++ b/tools/run-nm-test.sh @@ -230,8 +230,8 @@ fi if ! _is_true "$NMTST_USE_VALGRIND" 0; then export NM_TEST_UNDER_VALGRIND=0 - "${NMTST_DBUS_RUN_SESSION[@]}" \ - exec "$TEST" "$@" + exec "${NMTST_DBUS_RUN_SESSION[@]}" \ + "$TEST" "$@" fi if [[ -z "${NMTST_VALGRIND}" ]]; then |