From 9c642eac191ef0dce49855d8da0a9e9af18d5113 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 6 Nov 2019 20:45:33 +0100 Subject: New upstream version 1.20.6 --- tools/run-nm-test.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tools') 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" \ -- cgit 1.3.0-6-gf8a5