summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-10-02 09:40:11 +0200
committerThomas Haller <thaller@redhat.com>2019-10-02 09:47:54 +0200
commitb9c4d2bb72d4aeae256705317fb932cda22d133e (patch)
tree57a4ce320ecddc2af948180dd972775b5959dd70
parent1224bb19a6ca72f0d66f8d3e88a97e09acf22808 (diff)
downloadNetworkManager-b9c4d2bb72d4aeae256705317fb932cda22d133e.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')
-rwxr-xr-xtools/run-nm-test.sh4
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