diff options
| author | glider <glider@chromium.org> | 2014-12-29 08:08:39 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-29 16:09:21 +0000 |
| commit | 56429a874759a5b29699dd85ef488cdfa96f596f (patch) | |
| tree | 6735e8a41f3da9ceec611581cd8b7e837899e46f /tools/valgrind/chrome_tests.sh | |
| parent | abac192b6529e392dc15b0b74f23ca20fd84047c (diff) | |
| download | chromium_src-56429a874759a5b29699dd85ef488cdfa96f596f.zip chromium_src-56429a874759a5b29699dd85ef488cdfa96f596f.tar.gz chromium_src-56429a874759a5b29699dd85ef488cdfa96f596f.tar.bz2 | |
Remove the TSan-related code from the scripts in tools/valgrind
BUG=351259
R=timurrrr@chromium.org
NOTRY=true
Review URL: https://codereview.chromium.org/823313002
Cr-Commit-Position: refs/heads/master@{#309708}
Diffstat (limited to 'tools/valgrind/chrome_tests.sh')
| -rwxr-xr-x | tools/valgrind/chrome_tests.sh | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/tools/valgrind/chrome_tests.sh b/tools/valgrind/chrome_tests.sh index df5e8e7..479138e 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 |