[zorg] r254812 - Add check-tsan invocation in CMake external debug compiler-rt build

[Alexey Samsonov via llvm-commits]

Author: samsonov
Date: Fri Dec  4 18:57:52 2015
New Revision: 254812

URL: http://llvm.org/viewvc/llvm-project?rev=254812&view=rev
Log:
Add check-tsan invocation in CMake external debug compiler-rt build

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

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=254812&r1=254811&r2=254812&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:57:52 2015
@@ -23,21 +23,25 @@ CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
 
 LLVM_CHECKOUT=${ROOT}/llvm
-CMAKE_COMMON_OPTIONS="-DLLVM_ENABLE_ASSERTIONS=ON"
+CMAKE_COMMON_OPTIONS="-DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON"
 
 echo @@@BUILD_STEP update@@@
 buildbot_update
 
-echo @@@BUILD_STEP build fresh clang@@@
+echo @@@BUILD_STEP build fresh clang + debug compiler-rt@@@
 if [ ! -d clang_build ]; then
   mkdir clang_build
 fi
 TARGETS="clang llvm-symbolizer compiler-rt FileCheck not"
 (cd clang_build && CC=gcc CXX=g++ cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  ${CMAKE_COMMON_OPTIONS} ${LLVM_CHECKOUT})
+  ${CMAKE_COMMON_OPTIONS} -DCOMPILER_RT_DEBUG=ON ${LLVM_CHECKOUT})
+
 (cd clang_build && make -j$MAKE_JOBS ${TARGETS}) || echo @@@STEP_FAILURE@@@
 CLANG_PATH=$ROOT/clang_build/bin
 
+echo @@@BUILD_STEP test tsan in debug compiler-rt build@@@
+(cd clang_build && make -j$MAKE_JOBS check-tsan) || echo @@@STEP_FAILURE@@@
+
 echo @@@BUILD_STEP prepare for testing tsan@@@
 
 TSAN_PATH=$ROOT/llvm/projects/compiler-rt/lib/tsan/