[zorg] r225569 - Improvements to sanitizer-bootstrap buildbot:

[Alexey Samsonov]

Author: samsonov
Date: Fri Jan  9 18:46:55 2015
New Revision: 225569

URL: http://llvm.org/viewvc/llvm-project?rev=225569&view=rev
Log:
Improvements to sanitizer-bootstrap buildbot:

* Only build/test llvm/clang on stage3 for ASan and MSan
  (to work around the build failures in lld)
* Make check-llvm failures fatal in UBSan bootstrap (all the issues are now fixed)
* Make check-clang failures non-fatal in UBSan bootstrap (currently there's
  some issue with this command on the buildbot).



Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh?rev=225569&r1=225568&r2=225569&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh Fri Jan  9 18:46:55 2015
@@ -64,13 +64,14 @@ mkdir -p ${STAGE3_MSAN_DIR}
 clang_msan_path=$ROOT/${STAGE2_MSAN_DIR}/bin
 cmake_stage3_msan_options="${CMAKE_COMMON_OPTIONS} -DCMAKE_C_COMPILER=${clang_msan_path}/clang -DCMAKE_CXX_COMPILER=${clang_msan_path}/clang++ -DLLVM_PARALLEL_COMPILE_JOBS=15"
 
-(cd ${STAGE3_MSAN_DIR} && cmake ${cmake_stage3_msan_options} $LLVM && ninja) || \
+(cd ${STAGE3_MSAN_DIR} && cmake ${cmake_stage3_msan_options} $LLVM && ninja clang) || \
   echo @@@STEP_FAILURE@@@
 
 
-echo @@@BUILD_STEP check-all stage3/msan@@@
+echo @@@BUILD_STEP check-llvm check-clang stage3/msan@@@
 
-(cd ${STAGE3_MSAN_DIR} && ninja check-all) || echo @@@STEP_FAILURE@@@
+(cd ${STAGE3_MSAN_DIR} && ninja check-llvm) || echo @@@STEP_FAILURE@@@
+(cd ${STAGE3_MSAN_DIR} && ninja check-clang) || echo @@@STEP_FAILURE@@@
 
 
 # Stage 2 / AddressSanitizer
@@ -88,21 +89,23 @@ mkdir -p ${STAGE3_ASAN_DIR}
 clang_asan_path=$ROOT/${STAGE2_ASAN_DIR}/bin
 cmake_stage3_asan_options="${CMAKE_COMMON_OPTIONS} -DCMAKE_C_COMPILER=${clang_asan_path}/clang -DCMAKE_CXX_COMPILER=${clang_asan_path}/clang++ -DLLVM_PARALLEL_COMPILE_JOBS=10"
 
-(cd ${STAGE3_ASAN_DIR} && cmake ${cmake_stage3_asan_options} $LLVM && ninja) || \
+(cd ${STAGE3_ASAN_DIR} && cmake ${cmake_stage3_asan_options} $LLVM && ninja clang) || \
   echo @@@STEP_FAILURE@@@
 
 
-echo @@@BUILD_STEP check-all stage3/asan@@@
+echo @@@BUILD_STEP check-llvm check-clang stage3/asan@@@
 
 export ASAN_OPTIONS="check_initialization_order=true:detect_leaks=1"
 
-(cd ${STAGE3_ASAN_DIR} && ninja check-all) || echo @@@STEP_FAILURE@@@
+(cd ${STAGE3_ASAN_DIR} && ninja check-llvm) || echo @@@STEP_FAILURE@@@
+(cd ${STAGE3_ASAN_DIR} && ninja check-clang) || echo @@@STEP_FAILURE@@@
 
-echo @@@BUILD_STEP check-all stage3/asan-uar@@@
+echo @@@BUILD_STEP check-llvm check-clang stage3/asan-uar@@@
 
 export ASAN_OPTIONS="check_initialization_order=true:detect_stack_use_after_return=1:detect_leaks=1"
 
-(cd ${STAGE3_ASAN_DIR} && ninja check-all) || echo @@@STEP_FAILURE@@@
+(cd ${STAGE3_ASAN_DIR} && ninja check-llvm) || echo @@@STEP_FAILURE@@@
+(cd ${STAGE3_ASAN_DIR} && ninja check-clang) || echo @@@STEP_FAILURE@@@
 
 # Stage 2 / UndefinedBehaviorSanitizer
 

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh?rev=225569&r1=225568&r2=225569&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh Fri Jan  9 18:46:55 2015
@@ -206,17 +206,17 @@ function check_stage2 {
   local build_dir=$2
   echo @@@BUILD_STEP check-llvm ${sanitizer_name}@@@
 
+  (cd ${build_dir} && ninja check-llvm) || echo @@@STEP_FAILURE@@@
+
+  echo @@@BUILD_STEP check-clang ${sanitizer_name}@@@
+
   # TODO(samsonov): change this to STEP_FAILURE once green
   if [ "${sanitizer_name}" == "ubsan" ]; then
-    (cd ${build_dir} && ninja check-llvm) || echo @@@STEP_WARNINGS@@@
+    (cd ${build_dir} && ninja check-clang) || echo @@@STEP_WARNINGS@@@
   else
-    (cd ${build_dir} && ninja check-llvm) || echo @@@STEP_FAILURE@@@
+    (cd ${build_dir} && ninja check-clang) || echo @@@STEP_FAILURE@@@
   fi
 
-  echo @@@BUILD_STEP check-clang ${sanitizer_name}@@@
-
-  (cd ${build_dir} && ninja check-clang) || echo @@@STEP_FAILURE@@@
-
   echo @@@BUILD_STEP check-lld ${sanitizer_name}@@@
 
   # TODO(smatveev): change this to STEP_FAILURE once green