2 files changed, 10 insertions, 2 deletions

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index a314a57b4..ed235cfaf 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 433cb069a..c353c2cbc 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