about summary refs log tree commit diff
path: root/tools
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2019-11-06 20:46:28 +0100
committerMichael Biebl <biebl@debian.org>2019-11-06 20:46:28 +0100
commit515e1311d22086215e182f18a4529f24660ca4c3 (patch)
tree5b1d21eeceaa57d233d46ddfeeca5e0c1fc8b8a3 /tools
parent790e3946f0274a272fdda4d8697ce31a757a48d2 (diff)
parent9c642eac191ef0dce49855d8da0a9e9af18d5113 (diff)
Update upstream source from tag 'upstream/1.20.6'
Update to upstream version '1.20.6'
with Debian dir 93035bdc0e2b22e7410d6c70c55a21648f836a2f
Diffstat (limited to 'tools')
-rwxr-xr-xtools/run-nm-test.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh
index 135310ac..140236dc 100755
--- a/tools/run-nm-test.sh
+++ b/tools/run-nm-test.sh
@@ -229,9 +229,9 @@ if [[ -n "$BUILDDIR" ]]; then
 fi
 
 if ! _is_true "$NMTST_USE_VALGRIND" 0; then
-    "${NMTST_DBUS_RUN_SESSION[@]}" \
+    export NM_TEST_UNDER_VALGRIND=0
+    exec "${NMTST_DBUS_RUN_SESSION[@]}" \
     "$TEST" "$@"
-    exit $?
 fi
 
 if [[ -z "${NMTST_VALGRIND}" ]]; then
@@ -250,6 +250,7 @@ LOGFILE="${TEST}.valgrind-log"
 
 export G_SLICE=always-malloc
 export G_DEBUG=gc-friendly
+export NM_TEST_UNDER_VALGRIND=1
 "${NMTST_DBUS_RUN_SESSION[@]}" \
 "${NMTST_LIBTOOL[@]}" \
 "$NMTST_VALGRIND" \