diff options
| author | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-07 16:53:57 +0100 |
|---|---|---|
| committer | Sebastien Bacher <seb128@ubuntu.com> | 2020-01-07 16:56:18 +0100 |
| commit | 5035d260cb1cde38bfdc732e0d1ff8b3ca78135c (patch) | |
| tree | 1433995e753effc7cfa4f63266691bdc8b5ad6b3 /tools | |
| parent | 21add8edb7927d06f038208fd6271202063d5293 (diff) | |
| parent | 121343423a2e75e15e16988e664a8b32a629f2ba (diff) | |
Merge tag 'debian/1.20.6-1'
network-manager Debian release 1.20.6-1
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/run-nm-test.sh | 5 |
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" \ |