[zorg] r370132 - [sanitizer] Move "build stage1 clang" message into functions.sh

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Tue Aug 27 17:27:23 2019
New Revision: 370132

URL: http://llvm.org/viewvc/llvm-project?rev=370132&view=rev
Log:
[sanitizer] Move "build stage1 clang" message into functions.sh

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_mte.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh?rev=370132&r1=370131&r2=370132&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_asan.sh Tue Aug 27 17:27:23 2019
@@ -36,8 +36,6 @@ buildbot_update
 
 # Stage 1
 
-echo @@@BUILD_STEP build stage1 clang@@@
-
 build_stage1_clang
 
 # Stage 2 / AddressSanitizer

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh?rev=370132&r1=370131&r2=370132&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_msan.sh Tue Aug 27 17:27:23 2019
@@ -36,8 +36,6 @@ buildbot_update
 
 # Stage 1
 
-echo @@@BUILD_STEP build stage1 clang@@@
-
 build_stage1_clang
 
 # Stage 2 / Memory Sanitizer

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh?rev=370132&r1=370131&r2=370132&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap_ubsan.sh Tue Aug 27 17:27:23 2019
@@ -36,8 +36,6 @@ buildbot_update
 
 # Stage 1
 
-echo @@@BUILD_STEP build stage1 clang@@@
-
 build_stage1_clang
 
 # 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=370132&r1=370131&r2=370132&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_functions.sh Tue Aug 27 17:27:23 2019
@@ -175,7 +175,7 @@ function gclient_runhooks {
   )
 }
 
-function build_stage1_clang {
+function build_stage1_clang_impl {
   mkdir -p ${STAGE1_DIR}
   local cmake_stage1_options="${CMAKE_COMMON_OPTIONS}"
   if [[ "$USE_GIT" != "0" ]]; then
@@ -185,6 +185,11 @@ function build_stage1_clang {
     ninja clang lld compiler-rt llvm-symbolizer)
 }
 
+function build_stage1_clang {
+  echo @@@BUILD_STEP build stage1 clang@@@
+  build_stage1_clang_impl
+}
+
 function build_stage1_clang_at_revison {
   local HOST_CLANG_REVISION=360832
 
@@ -200,8 +205,8 @@ function build_stage1_clang_at_revison {
     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
+    build_stage1_clang_impl && \
+      ( echo $HOST_CLANG_REVISION > ${STAGE1_DIR}/host_clang_revision )
   fi
 }
 

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh?rev=370132&r1=370131&r2=370132&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh Tue Aug 27 17:27:23 2019
@@ -39,8 +39,6 @@ buildbot_update
 
 # Stage 1
 
-echo @@@BUILD_STEP build clang@@@
-
 build_stage1_clang
 
 clang_path=$ROOT/${STAGE1_DIR}/bin

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_mte.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_mte.sh?rev=370132&r1=370131&r2=370132&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_mte.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_mte.sh Tue Aug 27 17:27:23 2019
@@ -29,7 +29,6 @@ fi
 echo @@@BUILD_STEP update@@@
 buildbot_update
 
-echo @@@BUILD_STEP build@@@
 build_stage1_clang
 
 echo @@@BUILD_STEP check-llvm@@@