Update TSan to r1970

scripts/build-tsan-for-chromium.sh

 #!/bin/sh
 
 # Copyright (c) 2009-2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to build ThreadSanitizer binaries for use with chromium
 source common.sh
 
 POST_BUILD_HOOK_DEFINED=yes
@@ skipping 14 matching lines @@
       SPECIAL_FLAGS="OUTDIR=out32"
       SPECIAL_TARGET="l32"
     ;;
   esac
 
   make -j4 $SPECIAL_FLAGS OFFLINE= PIN_ROOT= \
            VALGRIND_INST_ROOT="$BINARIES_DIR/$PLATFORM" \
            VALGRIND_ROOT="$VG_TSAN_DIR" $SPECIAL_TARGET
 
   # See below for the definition of ORIG_BINARIES_DIR
-  $THISDIR/tsan/tsan_binary/mk-self-contained-tsan.sh \
-    "$VG_TSAN_DIR/out/$PLATFORM" \
+  $THISDIR/tsan/tsan/mk-self-contained-valgrind.sh \
+    "$VG_TSAN_DIR/out/$PLATFORM" "tsan" \
     "$ORIG_BINARIES_DIR/$PLATFORM/bin/valgrind-tsan.sh"
 }
 
-TSAN_REV=1860
+TSAN_REV=1970
 TSAN_DIR="$THISDIR/tsan" # Directory to checkout TSan sources
 rm -rf $TSAN_DIR
 svn co -r "$TSAN_REV" http://data-race-test.googlecode.com/svn/trunk $TSAN_DIR
 
 # The separate .sh file defines Valgrind/VEX revisions.
 source "tsan/third_party/valgrind_rev.sh"
 
 VG_TSAN_DIR="$THISDIR/valgrind-tsan" # Directory to checkout Valgrind sources
 checkout_and_patch_valgrind "$VALGRIND_REV" "$VEX_REV" "$VG_TSAN_DIR"
 
@@ skipping 30 matching lines @@
     fi
   fi
 fi
 
 # Ugly hack!
 # We build Valrgind binaries in the $VG_TSAN_DIR/out and then pack
 # them into self-contained .sh file into $ORIG_BINARIES_DIR/$PLATFORM
 ORIG_BINARIES_DIR=$BINARIES_DIR
 BINARIES_DIR="$VG_TSAN_DIR/out"
 build_valgrind_for_available_platforms