Changeset 782 for git/branches/dmik/t/valgrind/valgrind.sh

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• t/valgrind/valgrind.sh (modified) (1 diff)

git/branches/dmik/t/valgrind/valgrind.sh ¶

@@ -3 +3 @@
 base=$(basename "$0")
 
-TRACK_ORIGINS=
+TOOL_OPTIONS='--leak-check=no'
 
-VALGRIND_VERSION=$(valgrind --version)
-VALGRIND_MAJOR=$(expr "$VALGRIND_VERSION" : '[^0-9]*\([0-9]*\)')
-VALGRIND_MINOR=$(expr "$VALGRIND_VERSION" : '[^0-9]*[0-9]*\.\([0-9]*\)')
-test 3 -gt "$VALGRIND_MAJOR" ||
-test 3 -eq "$VALGRIND_MAJOR" -a 4 -gt "$VALGRIND_MINOR" ||
-TRACK_ORIGINS=--track-origins=yes
+test -z "$GIT_VALGRIND_ENABLED" &&
+exec "$GIT_VALGRIND"/../../"$base" "$@"
+
+case "$GIT_VALGRIND_MODE" in
+memcheck-fast)
+        ;;
+memcheck)
+        VALGRIND_VERSION=$(valgrind --version)
+        VALGRIND_MAJOR=$(expr "$VALGRIND_VERSION" : '[^0-9]*\([0-9]*\)')
+        VALGRIND_MINOR=$(expr "$VALGRIND_VERSION" : '[^0-9]*[0-9]*\.\([0-9]*\)')
+        test 3 -gt "$VALGRIND_MAJOR" ||
+        test 3 -eq "$VALGRIND_MAJOR" -a 4 -gt "$VALGRIND_MINOR" ||
+        TOOL_OPTIONS="$TOOL_OPTIONS --track-origins=yes"
+        ;;
+*)
+        TOOL_OPTIONS="--tool=$GIT_VALGRIND_MODE"
+esac
 
 exec valgrind -q --error-exitcode=126 \
-        --leak-check=no \
+        --gen-suppressions=all \
         --suppressions="$GIT_VALGRIND/default.supp" \
-        --gen-suppressions=all \
-        $TRACK_ORIGINS \
+        $TOOL_OPTIONS \
         --log-fd=4 \
         --input-fd=4 \