[zorg] Switch sanitizer-x86_64-linux-fast to use git

[vlad.tsyrklevich]

Any reason not to switch the other bots as well?

[eugenis]

zorg/buildbot/builders/sanitizers/buildbot_functions.sh

181

Is USE_GIT initialized to 0 anywhere?

[vitalybuka]

CHECK_LLD

[vitalybuka]

In D66829#1647792, @vlad.tsyrklevich wrote:

Any reason not to switch the other bots as well?

I'll do in followup patches while this one is running on bot

[vitalybuka]

USE_GIT=0

zorg/buildbot/builders/sanitizers/buildbot_fast.sh

 #!/usr/bin/env bash
 
 set -x
 set -e
 set -u
 
 HERE="$(cd $(dirname $0) && pwd)"
 . ${HERE}/buildbot_functions.sh
 
 ROOT=`pwd`
 PLATFORM=`uname`
 export PATH="/usr/local/bin:$PATH"
 
+USE_GIT=1
+
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
 STAGE1_DIR=llvm_build0
 STAGE2_ASAN_DIR=llvm_build_asan
 STAGE2_MSAN_DIR=llvm_build_msan
 STAGE2_UBSAN_DIR=llvm_build_ubsan
 STAGE2_LIBCXX_MSAN_DIR=libcxx_build_msan
 STAGE2_LIBCXX_ASAN_DIR=libcxx_build_asan
 STAGE2_LIBCXX_UBSAN_DIR=libcxx_build_ubsan
 STAGE1_CLOBBER="${STAGE2_LIBCXX_MSAN_DIR} ${STAGE2_LIBCXX_ASAN_DIR} ${STAGE2_LIBCXX_UBSAN_DIR} ${STAGE2_MSAN_DIR} ${STAGE2_ASAN_DIR} ${STAGE2_UBSAN_DIR}"
 LLVM=$ROOT/llvm
 CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_PARALLEL_LINK_JOBS=20"
 
 if [ "$BUILDBOT_CLOBBER" != "" ]; then
   echo @@@BUILD_STEP clobber@@@
   rm -rf llvm
+  rm -rf llvm-project
   rm -rf ${STAGE1_DIR}
 fi
 
 # Stage 1
 
 build_stage1_clang_at_revison
 
 CMAKE_COMMON_OPTIONS="$CMAKE_COMMON_OPTIONS -DLLVM_ENABLE_ASSERTIONS=ON"
 
 echo @@@BUILD_STEP update@@@
-buildbot_update
+buildbot_update_git
 
 # Stage 2 / Memory Sanitizer
 
 build_stage2_msan
 
 check_stage2_msan
 
 # Stage 2 / AddressSanitizer

zorg/buildbot/builders/sanitizers/buildbot_functions.sh

if [ -d "$BUILDBOT_MONO_REPO_PATH" ]; then
     return
   fi
 
   update_or_checkout "$rev_arg" http://llvm.org/svn/llvm-project/$repo_name/trunk $tree &
 }
 
 
 function buildbot_update {
+    if [[ "$USE_GIT" != "0" ]]; then
+      buildbot_update_git
+      return
+    fi
     if [[ -d "$BUILDBOT_MONO_REPO_PATH" ]]; then
       BUILDBOT_REVISION="-"
     else
       if [[ "$BUILDBOT_REVISION" == "-" ]]; then
         return
       fi
     fi
 
function gclient_runhooks {
   export CXX="$CLANG_BIN/clang++"
   
   gclient runhooks
   )
 }
 
 function build_stage1_clang {
   mkdir -p ${STAGE1_DIR}
-  cmake_stage1_options="${CMAKE_COMMON_OPTIONS}"
+  local cmake_stage1_options="${CMAKE_COMMON_OPTIONS}"
+  if [[ "$USE_GIT" != "0" ]]; then
+    cmake_stage1_options="${cmake_stage1_options} -DLLVM_ENABLE_PROJECTS='clang;compiler-rt;lld'"
+  fi
   (cd ${STAGE1_DIR} && cmake ${cmake_stage1_options} $LLVM && \
     ninja clang lld compiler-rt llvm-symbolizer)
 }
 
 function build_stage1_clang_at_revison {
   local HOST_CLANG_REVISION=360832
 
   if  [ -r ${STAGE1_DIR}/host_clang_revision ] && \
       [ "$(cat ${STAGE1_DIR}/host_clang_revision)" == $HOST_CLANG_REVISION ]
   then
     echo @@@BUILD_STEP using pre-built stage1 clang at r$HOST_CLANG_REVISION@@@
   else
     echo @@@BUILD_STEP sync to r$HOST_CLANG_REVISION@@@
-    (BUILDBOT_REVISION=$HOST_CLANG_REVISION buildbot_update)
+    BUILDBOT_REVISION=$HOST_CLANG_REVISION buildbot_update
 
     echo @@@BUILD_STEP Clear ${STAGE1_DIR} ${STAGE1_CLOBBER}
     rm -rf ${STAGE1_DIR} ${STAGE1_CLOBBER}
 
     echo @@@BUILD_STEP build stage1 clang at r$HOST_CLANG_REVISION@@@
     build_stage1_clang
     echo $HOST_CLANG_REVISION > ${STAGE1_DIR}/host_clang_revision
   fi
function build_stage2 {
   local sanitizer_cflags=""
   local cmake_libcxx_flag="-DLLVM_ENABLE_LIBCXX=OFF"
 
   # Don't use libc++/libc++abi in UBSan builds (due to known bugs).
   if [ "$CHECK_LIBCXX" != "0" -a \
        "$sanitizer_name" != "ubsan" ]; then
     echo @@@BUILD_STEP build libcxx/$sanitizer_name@@@
     mkdir -p ${libcxx_build_dir}
+    local cmake_stage2_libcxx_options=
+    if [[ "$USE_GIT" != "0" ]]; then
+      cmake_stage2_libcxx_options="-DLLVM_ENABLE_PROJECTS='libcxx;libcxxabi'"
+    fi
     (cd ${libcxx_build_dir} && \
       cmake \
         ${cmake_stage2_common_options} \
+        ${cmake_stage2_libcxx_options} \
         -DCMAKE_BUILD_TYPE=${build_type} \
         -DLLVM_USE_SANITIZER=${llvm_use_sanitizer} \
         $LLVM && \
       ninja cxx cxxabi) || echo $step_result
     sanitizer_ldflags="$sanitizer_ldflags -lc++abi -Wl,--rpath=${ROOT}/${libcxx_build_dir}/lib -L${ROOT}/${libcxx_build_dir}/lib"
     sanitizer_cflags="$sanitizer_cflags -nostdinc++ -isystem ${ROOT}/${libcxx_build_dir}/include -isystem ${ROOT}/${libcxx_build_dir}/include/c++/v1"
     cmake_libcxx_flag="-DLLVM_ENABLE_LIBCXX=ON"
   fi
 
   echo @@@BUILD_STEP build clang/$sanitizer_name@@@
 
   # See http://llvm.org/bugs/show_bug.cgi?id=19071, http://www.cmake.org/Bug/view.php?id=15264
   local cmake_bug_workaround_cflags="$sanitizer_ldflags $fsanitize_flag -w"
   sanitizer_cflags="$sanitizer_cflags $cmake_bug_workaround_cflags"
 
   mkdir -p ${build_dir}
   local extra_dir
   if [ "$CHECK_LLD" != "0" ]; then
     extra_dir="lld"
   fi
+  local cmake_stage2_clang_options=
+  if [[ "$USE_GIT" != "0" ]]; then
+    cmake_stage2_clang_options="-DLLVM_ENABLE_PROJECTS='clang;compiler-rt;lld'"
+  fi
   (cd ${build_dir} && \
-   cmake ${cmake_stage2_common_options} \
+   cmake \
+     ${cmake_stage2_common_options} \
+     ${cmake_stage2_clang_options} \
      -DCMAKE_BUILD_TYPE=${build_type} \
      -DLLVM_USE_SANITIZER=${llvm_use_sanitizer} \
      ${cmake_libcxx_flag} \
      -DCMAKE_C_FLAGS="${sanitizer_cflags}" \
      -DCMAKE_CXX_FLAGS="${sanitizer_cflags}" \
      -DCMAKE_EXE_LINKER_FLAGS="${sanitizer_ldflags}" \
      $LLVM && \
    ninja clang ${extra_dir}) || echo $step_result