diff options
Diffstat (limited to 'regress')
-rw-r--r-- | regress/test-exec.sh | 6 | ||||
-rwxr-xr-x | 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 a314a57b4..ed235cfaf 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -163,9 +163,13 @@ if [ "x$USE_VALGRIND" != "x" ]; then | |||
163 | esac | 163 | esac |
164 | 164 | ||
165 | if [ x"$VG_SKIP" = "x" ]; then | 165 | if [ x"$VG_SKIP" = "x" ]; then |
166 | VG_LEAK="--leak-check=no" | ||
167 | if [ x"$VALGRIND_CHECK_LEAKS" = "x" ]; then | ||
168 | VG_LEAK="--leak-check=full" | ||
169 | fi | ||
166 | VG_IGNORE="/bin/*,/sbin/*,/usr/*,/var/*" | 170 | VG_IGNORE="/bin/*,/sbin/*,/usr/*,/var/*" |
167 | VG_LOG="$OBJ/valgrind-out/${VG_TEST}." | 171 | VG_LOG="$OBJ/valgrind-out/${VG_TEST}." |
168 | VG_OPTS="--track-origins=yes --leak-check=full" | 172 | VG_OPTS="--track-origins=yes $VG_LEAK" |
169 | VG_OPTS="$VG_OPTS --trace-children=yes" | 173 | VG_OPTS="$VG_OPTS --trace-children=yes" |
170 | VG_OPTS="$VG_OPTS --trace-children-skip=${VG_IGNORE}" | 174 | VG_OPTS="$VG_OPTS --trace-children-skip=${VG_IGNORE}" |
171 | VG_PATH="valgrind" | 175 | 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 | |||
8 | 8 | ||
9 | # This mostly replicates the logic in test-exec.sh for running the | 9 | # This mostly replicates the logic in test-exec.sh for running the |
10 | # regress tests under valgrind. | 10 | # regress tests under valgrind. |
11 | VG_LEAK="--leak-check=no" | ||
12 | if [ x"$VALGRIND_CHECK_LEAKS" = "x" ]; then | ||
13 | VG_LEAK="--leak-check=full" | ||
14 | fi | ||
11 | VG_TEST=`basename $UNIT_BINARY` | 15 | VG_TEST=`basename $UNIT_BINARY` |
12 | VG_LOG="$OBJ/valgrind-out/${VG_TEST}.%p" | 16 | VG_LOG="$OBJ/valgrind-out/${VG_TEST}.%p" |
13 | VG_OPTS="--track-origins=yes --leak-check=full --log-file=${VG_LOG}" | 17 | VG_OPTS="--track-origins=yes $VG_LEAK --log-file=${VG_LOG}" |
14 | VG_OPTS="$VG_OPTS --trace-children=yes" | 18 | VG_OPTS="$VG_OPTS --trace-children=yes" |
15 | VG_PATH="valgrind" | 19 | VG_PATH="valgrind" |
16 | if [ "x$VALGRIND_PATH" != "x" ]; then | 20 | if [ "x$VALGRIND_PATH" != "x" ]; then |