[zorg] r315980 - [zorg] Remove non UAR asan pass and move ASAN_OPTIONS setup in-front of stage3

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Tue Oct 17 00:17:55 2017
New Revision: 315980

URL: http://llvm.org/viewvc/llvm-project?rev=315980&view=rev
Log:
[zorg] Remove non UAR asan pass and move ASAN_OPTIONS setup in-front of stage3

We check how instrumented clang can build itself. Most work is done in
"ninja clang", so need correct ASAN_OPTIONS before that.

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.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=315980&r1=315979&r2=315980&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh Tue Oct 17 00:17:55 2017
@@ -57,20 +57,13 @@ 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++"
 
+export ASAN_OPTIONS="check_initialization_order=true:detect_stack_use_after_return=1:detect_leaks=1"
+
 (cd ${STAGE3_ASAN_DIR} && cmake ${cmake_stage3_asan_options} $LLVM && ninja clang) || \
   echo @@@STEP_FAILURE@@@
 
-
 echo @@@BUILD_STEP check-llvm check-clang stage3/asan@@@
 
-export ASAN_OPTIONS="check_initialization_order=true:detect_stack_use_after_return=0:detect_leaks=1"
-
 (cd ${STAGE3_ASAN_DIR} && ninja check-llvm) || echo @@@STEP_FAILURE@@@
 (cd ${STAGE3_ASAN_DIR} && ninja check-clang) || echo @@@STEP_FAILURE@@@
 
-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-llvm) || echo @@@STEP_FAILURE@@@
-(cd ${STAGE3_ASAN_DIR} && ninja check-clang) || echo @@@STEP_FAILURE@@@