[openssh-commits] [openssh] 01/01: disable valgrind memleak checking by default

[git+noreply at mindrot.org]

This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit d20720d373d8563ee737d1a45dc5e0804d622dbc
Author: Damien Miller <djm at mindrot.org>
Date:   Wed Jul 11 09:56:36 2018 +1000

    disable valgrind memleak checking by default
    
    Add VALGRIND_CHECK_LEAKS knob to turn it back on.
---
 regress/test-exec.sh     | 6 +++++-
 regress/valgrind-unit.sh | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index a314a57b..ed235cfa 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -163,9 +163,13 @@ if [ "x$USE_VALGRIND" != "x" ]; then
 	esac
 
 	if [ x"$VG_SKIP" = "x" ]; then
+		VG_LEAK="--leak-check=no"
+		if [ x"$VALGRIND_CHECK_LEAKS" = "x" ]; then
+			VG_LEAK="--leak-check=full"
+		fi
 		VG_IGNORE="/bin/*,/sbin/*,/usr/*,/var/*"
 		VG_LOG="$OBJ/valgrind-out/${VG_TEST}."
-		VG_OPTS="--track-origins=yes --leak-check=full"
+		VG_OPTS="--track-origins=yes $VG_LEAK"
 		VG_OPTS="$VG_OPTS --trace-children=yes"
 		VG_OPTS="$VG_OPTS --trace-children-skip=${VG_IGNORE}"
 		VG_PATH="valgrind"
diff --git a/regress/valgrind-unit.sh b/regress/valgrind-unit.sh
index 433cb069..c353c2cb 100755
--- a/regress/valgrind-unit.sh
+++ b/regress/valgrind-unit.sh
@@ -8,9 +8,13 @@ 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
 VG_TEST=`basename $UNIT_BINARY`
 VG_LOG="$OBJ/valgrind-out/${VG_TEST}.%p"
-VG_OPTS="--track-origins=yes --leak-check=full --log-file=${VG_LOG}"
+VG_OPTS="--track-origins=yes $VG_LEAK --log-file=${VG_LOG}"
 VG_OPTS="$VG_OPTS --trace-children=yes"
 VG_PATH="valgrind"
 if [ "x$VALGRIND_PATH" != "x" ]; then

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.