summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2018-07-13 03:39:25 +0200
committerDamien Miller <djm@mindrot.org>2018-07-13 03:41:33 +0200
commit2f6accff5085eb79b0dbe262d8b85ed017d1a51c (patch)
tree42045dfc3b140e6089dd422dcb38d771376028a0
parentincrease timeout to match cfgmatch.sh (diff)
downloadopenssh-2f6accff5085eb79b0dbe262d8b85ed017d1a51c.tar.xz
openssh-2f6accff5085eb79b0dbe262d8b85ed017d1a51c.zip
Enable leak checks for unit tests with valgrind
Leave the leak checking on unconditionally when running with valgrind. The unit tests are leak-free and I want them to stay that way.
Diffstat (limited to '')
-rwxr-xr-xregress/valgrind-unit.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/regress/valgrind-unit.sh b/regress/valgrind-unit.sh
index d1c110008..4143ead4b 100755
--- a/regress/valgrind-unit.sh
+++ b/regress/valgrind-unit.sh
@@ -7,11 +7,9 @@ UNIT_ARGS="$@"
test "x$OBJ" = "x" && OBJ=$PWD
# This mostly replicates the logic in test-exec.sh for running the
-# regress tests under valgrind.
-VG_LEAK="--leak-check=no"
-if [ x"$VALGRIND_CHECK_LEAKS" != "x" ]; then
- VG_LEAK="--leak-check=full"
-fi
+# regress tests under valgrind, except that we unconditionally enable
+# leak checking because the unit tests should be clean.
+VG_LEAK="--leak-check=full"
VG_TEST=`basename $UNIT_BINARY`
VG_LOG="$OBJ/valgrind-out/${VG_TEST}.%p"
VG_OPTS="--track-origins=yes $VG_LEAK --log-file=${VG_LOG}"