| OLD | NEW |
| 1 #!/bin/sh | 1 #!/bin/sh |
| 2 | 2 |
| 3 # Copyright (c) 2009-2010 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2009-2010 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 # Script to build ThreadSanitizer binaries for use with chromium | 7 # Script to build ThreadSanitizer binaries for use with chromium |
| 8 source common.sh | 8 source common.sh |
| 9 | 9 |
| 10 POST_BUILD_HOOK_DEFINED=yes | 10 POST_BUILD_HOOK_DEFINED=yes |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 "linux_x86") | 24 "linux_x86") |
| 25 SPECIAL_FLAGS="OUTDIR=out32" | 25 SPECIAL_FLAGS="OUTDIR=out32" |
| 26 SPECIAL_TARGET="l32" | 26 SPECIAL_TARGET="l32" |
| 27 ;; | 27 ;; |
| 28 esac | 28 esac |
| 29 | 29 |
| 30 make -j4 $SPECIAL_FLAGS OFFLINE= PIN_ROOT= \ | 30 make -j4 $SPECIAL_FLAGS OFFLINE= PIN_ROOT= \ |
| 31 VALGRIND_INST_ROOT="$BINARIES_DIR/$PLATFORM" \ | 31 VALGRIND_INST_ROOT="$BINARIES_DIR/$PLATFORM" \ |
| 32 VALGRIND_ROOT="$VG_TSAN_DIR" $SPECIAL_TARGET | 32 VALGRIND_ROOT="$VG_TSAN_DIR" $SPECIAL_TARGET |
| 33 | 33 |
| 34 OUT_BIN="$ORIG_BINARIES_DIR/$PLATFORM/bin" |
| 35 mkdir -p $OUT_BIN |
| 34 # See below for the definition of ORIG_BINARIES_DIR | 36 # See below for the definition of ORIG_BINARIES_DIR |
| 35 $THISDIR/tsan/tsan/mk-self-contained-valgrind.sh \ | 37 $THISDIR/tsan/tsan/mk-self-contained-valgrind.sh \ |
| 36 "$VG_TSAN_DIR/out/$PLATFORM" "tsan" \ | 38 "$VG_TSAN_DIR/out/$PLATFORM" "tsan" \ |
| 37 "$ORIG_BINARIES_DIR/$PLATFORM/bin/valgrind-tsan.sh" | 39 "$OUT_BIN/valgrind-tsan.sh" |
| 38 } | 40 } |
| 39 | 41 |
| 40 TSAN_REV=2088 | 42 TSAN_REV=2200 |
| 41 TSAN_DIR="$THISDIR/tsan" # Directory to checkout TSan sources | 43 TSAN_DIR="$THISDIR/tsan" # Directory to checkout TSan sources |
| 42 rm -rf $TSAN_DIR | 44 rm -rf $TSAN_DIR |
| 43 svn co -r "$TSAN_REV" http://data-race-test.googlecode.com/svn/trunk $TSAN_DIR | 45 svn co -r "$TSAN_REV" http://data-race-test.googlecode.com/svn/trunk $TSAN_DIR |
| 44 | 46 |
| 45 # The separate .sh file defines Valgrind/VEX revisions. | 47 # The separate .sh file defines Valgrind/VEX revisions. |
| 46 source "tsan/third_party/valgrind_rev.sh" | 48 source "tsan/third_party/valgrind_rev.sh" |
| 47 | 49 |
| 48 VG_TSAN_DIR="$THISDIR/valgrind-tsan" # Directory to checkout Valgrind sources | 50 VG_TSAN_DIR="$THISDIR/valgrind-tsan" # Directory to checkout Valgrind sources |
| 49 checkout_and_patch_valgrind "$VALGRIND_REV" "$VEX_REV" "$VG_TSAN_DIR" | 51 checkout_and_patch_valgrind "$VALGRIND_REV" "$VEX_REV" "$VG_TSAN_DIR" |
| 50 | 52 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 fi | 84 fi |
| 83 fi | 85 fi |
| 84 fi | 86 fi |
| 85 | 87 |
| 86 # Ugly hack! | 88 # Ugly hack! |
| 87 # We build Valrgind binaries in the $VG_TSAN_DIR/out and then pack | 89 # We build Valrgind binaries in the $VG_TSAN_DIR/out and then pack |
| 88 # them into self-contained .sh file into $ORIG_BINARIES_DIR/$PLATFORM | 90 # them into self-contained .sh file into $ORIG_BINARIES_DIR/$PLATFORM |
| 89 ORIG_BINARIES_DIR=$BINARIES_DIR | 91 ORIG_BINARIES_DIR=$BINARIES_DIR |
| 90 BINARIES_DIR="$VG_TSAN_DIR/out" | 92 BINARIES_DIR="$VG_TSAN_DIR/out" |
| 91 build_valgrind_for_available_platforms | 93 build_valgrind_for_available_platforms |
| OLD | NEW |