[zorg] r254810 - Slightly simplify buildbot_standard.sh - remove variable which is always set

[Alexey Samsonov via llvm-commits]

Author: samsonov
Date: Fri Dec  4 18:48:18 2015
New Revision: 254810

URL: http://llvm.org/viewvc/llvm-project?rev=254810&view=rev
Log:
Slightly simplify buildbot_standard.sh - remove variable which is always set

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py?rev=254810&r1=254809&r2=254810&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_selector.py Fri Dec  4 18:48:18 2015
@@ -29,7 +29,7 @@ BOT_ADDITIONAL_ENV = {
     'sanitizer-x86_64-linux': { 'HAVE_NINJA' : '1', 'BUILD_ANDROID' : '1', 'RUN_ANDROID' : '1' },
     'sanitizer-x86_64-linux-bootstrap': {},
     'sanitizer-x86_64-linux-fast': {},
-    'sanitizer-x86_64-linux-autoconf': { 'CHECK_TSAN': '1' },
+    'sanitizer-x86_64-linux-autoconf': {},
     'sanitizer-x86_64-linux-fuzzer': {},
 }
 

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh?rev=254810&r1=254809&r2=254810&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh Fri Dec  4 18:48:18 2015
@@ -19,7 +19,6 @@ fi
 ROOT=`pwd`
 PLATFORM=`uname`
 MAKE_JOBS=${MAX_MAKE_JOBS:-8}
-CHECK_TSAN=${CHECK_TSAN:-0}
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
 
@@ -39,25 +38,23 @@ TARGETS="clang llvm-symbolizer compiler-
 (cd clang_build && make -j$MAKE_JOBS ${TARGETS}) || echo @@@STEP_FAILURE@@@
 CLANG_PATH=$ROOT/clang_build/bin
 
-if [ $CHECK_TSAN == 1 ] ; then
-  echo @@@BUILD_STEP prepare for testing tsan@@@
+echo @@@BUILD_STEP prepare for testing tsan@@@
 
-  TSAN_PATH=$ROOT/llvm/projects/compiler-rt/lib/tsan/
-  (cd $TSAN_PATH && make -f Makefile.old install_deps)
+TSAN_PATH=$ROOT/llvm/projects/compiler-rt/lib/tsan/
+(cd $TSAN_PATH && make -f Makefile.old install_deps)
 
-  export PATH=$CLANG_PATH:$PATH
-  export MAKEFLAGS=-j$MAKE_JOBS
-  gcc -v 2>tmp && grep "version" tmp
-  clang -v 2>tmp && grep "version" tmp
-
-  cd $ROOT
-  if [ -d tsanv2 ]; then
-    (cd tsanv2 && svn cleanup && svn up --ignore-externals)
-  else
-    svn co http://data-race-test.googlecode.com/svn/trunk/ tsanv2
-  fi
-  export RACECHECK_UNITTEST_PATH=$ROOT/tsanv2/unittest
-
-  cp $ROOT/../sanitizer_buildbot/sanitizers/test_tsan.sh $TSAN_PATH
-  (cd $TSAN_PATH && ./test_tsan.sh)
+export PATH=$CLANG_PATH:$PATH
+export MAKEFLAGS=-j$MAKE_JOBS
+gcc -v 2>tmp && grep "version" tmp
+clang -v 2>tmp && grep "version" tmp
+
+cd $ROOT
+if [ -d tsanv2 ]; then
+  (cd tsanv2 && svn cleanup && svn up --ignore-externals)
+else
+  svn co http://data-race-test.googlecode.com/svn/trunk/ tsanv2
 fi
+export RACECHECK_UNITTEST_PATH=$ROOT/tsanv2/unittest
+
+cp $ROOT/../sanitizer_buildbot/sanitizers/test_tsan.sh $TSAN_PATH
+(cd $TSAN_PATH && ./test_tsan.sh)