Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(22)

Unified Diff: tools/valgrind/chrome_tests.sh

Issue 839143002: Roll Chrome into Mojo. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Rebase Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/valgrind/chrome_tests.py ('k') | tools/valgrind/drmemory/suppressions.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/valgrind/chrome_tests.sh
diff --git a/tools/valgrind/chrome_tests.sh b/tools/valgrind/chrome_tests.sh
index df5e8e745f2bef9b1da5d094b95dfe6a6f2e3839..479138e7ab4941cbd98c178093ad013eb0e36e34 100755
--- a/tools/valgrind/chrome_tests.sh
+++ b/tools/valgrind/chrome_tests.sh
@@ -9,11 +9,10 @@
export THISDIR=`dirname $0`
ARGV_COPY="$@"
-# We need to set CHROME_VALGRIND iff using Memcheck or TSan-Valgrind:
+# We need to set CHROME_VALGRIND iff using Memcheck:
# tools/valgrind/chrome_tests.sh --tool memcheck
# or
# tools/valgrind/chrome_tests.sh --tool=memcheck
-# (same for "--tool=tsan")
tool="memcheck" # Default to memcheck.
while (( "$#" ))
do
@@ -35,14 +34,6 @@ case "$tool" in
"memcheck")
NEEDS_VALGRIND=1
;;
- "tsan" | "tsan_rv")
- if [ "`uname -s`" == CYGWIN* ]
- then
- NEEDS_PIN=1
- else
- NEEDS_VALGRIND=1
- fi
- ;;
"drmemory" | "drmemory_light" | "drmemory_full" | "drmemory_pattern")
NEEDS_DRMEMORY=1
;;
@@ -95,28 +86,5 @@ then
fi
fi
-if [ "$NEEDS_PIN" == "1" ]
-then
- if [ -z "$PIN_COMMAND" ]
- then
- # Set up PIN_COMMAND to invoke TSan.
- TSAN_PATH="$THISDIR/../../third_party/tsan"
- TSAN_SFX="$TSAN_PATH/tsan-x86-windows-sfx.exe"
- echo "$TSAN_SFX"
- if [ ! -f $TSAN_SFX ]
- then
- echo "Can't find ThreadSanitizer executables."
- echo "See http://www.chromium.org/developers/how-tos/using-valgrind/threadsanitizer/threadsanitizer-on-windows"
- echo "for the instructions on how to get them."
- exit 1
- fi
-
- chmod +x "$TSAN_SFX" # Cygwin won't run it without +x.
- "$TSAN_SFX" -o"$TSAN_PATH"/unpacked -y
- export PIN_COMMAND="$TSAN_PATH/unpacked/tsan-x86-windows/tsan.bat"
- fi
-fi
-
-
PYTHONPATH=$THISDIR/../python/google python \
"$THISDIR/chrome_tests.py" $ARGV_COPY
« no previous file with comments | « tools/valgrind/chrome_tests.py ('k') | tools/valgrind/drmemory/suppressions.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698