[zorg] r370239 - [tsan] Use git on tsan bot

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Wed Aug 28 11:09:58 2019
New Revision: 370239

URL: http://llvm.org/viewvc/llvm-project?rev=370239&view=rev
Log:
[tsan] Use git on tsan bot

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=370239&r1=370238&r2=370239&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_standard.sh Wed Aug 28 11:09:58 2019
@@ -10,6 +10,8 @@ env
 HERE="$(dirname $0)"
 . ${HERE}/buildbot_functions.sh
 
+USE_GIT=1
+
 TSAN_DEBUG_BUILD_DIR=tsan_debug_build
 TSAN_FULL_DEBUG_BUILD_DIR=tsan_full_debug_build
 TSAN_RELEASE_BUILD_DIR=tsan_release_build
@@ -21,8 +23,6 @@ ROOT=`pwd`
 PLATFORM=`uname`
 MAKE_JOBS=${MAX_MAKE_JOBS:-$(nproc)}
 
-USE_GIT=0
-
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
 
@@ -36,6 +36,9 @@ function build_tsan {
   if [ ! -d $build_dir ]; then
     mkdir $build_dir
   fi
+  if [[ "$USE_GIT" != "0" ]]; then
+    extra_cmake_args="${extra_cmake_args} -DLLVM_ENABLE_PROJECTS='clang;compiler-rt'"
+  fi
   (cd $build_dir && CC="$3" CXX="$4" cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     ${CMAKE_COMMON_OPTIONS} ${extra_cmake_args} \
     ${LLVM})
@@ -61,4 +64,8 @@ build_tsan "${TSAN_RELEASE_BUILD_DIR}" "
 echo @@@BUILD_STEP tsan analyze@@@
 BIN=$(mktemp -t tsan_exe.XXXXXXXX)
 echo "int main() {return 0;}" | $TSAN_RELEASE_BUILD_DIR/bin/clang -x c++ - -fsanitize=thread -O2 -o ${BIN}
-$LLVM/projects/compiler-rt/lib/tsan/check_analyze.sh ${BIN} || echo @@@STEP_FAILURE@@@
+COMPILER_RT=$LLVM/projects/compiler-rt
+if [[ "$USE_GIT" != "0" ]]; then
+  COMPILER_RT=$LLVM/../compiler-rt
+fi
+$COMPILER_RT/lib/tsan/check_analyze.sh ${BIN} || echo @@@STEP_FAILURE@@@