summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Trevisan (TreviƱo) <mail@3v1n0.net>2019-09-30 19:44:45 +0200
committerThomas Haller <thaller@redhat.com>2020-04-20 11:55:23 +0200
commit43ff43e8b121737653876bb2e1f03eb719d8331f (patch)
treed523bdd5907ba1404343cd9af9112fe356b2d035
parent627dc8a9334ec96951f9c3f2cf0720915594f526 (diff)
downloadNetworkManager-43ff43e8b121737653876bb2e1f03eb719d8331f.tar.gz
run-nm-test: Set NM_TEST_UNDER_VALGRIND accordingly
When a test is going to be run under valgrind we set NM_TEST_UNDER_VALGRIND so that we can properly check whether this is happening. (cherry picked from commit 073eda68fcfda777fb5ec93c41e5babe21ce7be1) (cherry picked from commit 963ff8c2ab6d78bd4bd3e3c4bf6d2f061b9917e5)
-rwxr-xr-xtools/run-nm-test.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/run-nm-test.sh b/tools/run-nm-test.sh
index 6e7d02c845..4ee764fb1c 100755
--- a/tools/run-nm-test.sh
+++ b/tools/run-nm-test.sh
@@ -229,6 +229,7 @@ if [[ -n "$BUILDDIR" ]]; then
fi
if ! _is_true "$NMTST_USE_VALGRIND" 0; then
+ export NM_TEST_UNDER_VALGRIND=0
"${NMTST_DBUS_RUN_SESSION[@]}" \
"$TEST" "$@"
exit $?
@@ -250,6 +251,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" \