[zorg] r282696 - Revert "revert"

Vitaly Buka via llvm-commits llvm-commits at lists.llvm.org
Thu Sep 29 00:36:24 PDT 2016


Author: vitalybuka
Date: Thu Sep 29 02:36:24 2016
New Revision: 282696

URL: http://llvm.org/viewvc/llvm-project?rev=282696&view=rev
Log:
Revert "revert"

This reverts commit 397f6dab1d26c6c7dd9d26a489397f87693c9248.

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=282696&r1=282695&r2=282696&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_bootstrap.sh Thu Sep 29 02:36:24 2016
@@ -23,7 +23,13 @@ STAGE2_UBSAN_DIR=llvm_build_ubsan
 STAGE3_ASAN_DIR=llvm_build2_asan
 STAGE3_MSAN_DIR=llvm_build2_msan
 LLVM=$ROOT/llvm
-CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_PARALLEL_LINK_JOBS=20"
+ZLIB=$ROOT/zlib
+CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_PARALLEL_LINK_JOBS=10"
+
+function build_symbolizer {
+  check_stage2 msan "${STAGE2_MSAN_DIR}" @@@STEP_FAILURE@@@
+  (cd $1 && $LLVM/ninja check-llvm) || echo @@@STEP_FAILURE@@@
+}
 
 if [ "$BUILDBOT_CLOBBER" != "" ]; then
   echo @@@BUILD_STEP clobber@@@
@@ -34,18 +40,21 @@ fi
 # CMake does not notice that the compiler itself has changed.
 # Anyway, incremental builds of stage2 and stage3 compilers don't make sense.
 # Clobber the build trees.
-rm -rf ${STAGE2_LIBCXX_MSAN_DIR}
-rm -rf ${STAGE2_LIBCXX_ASAN_DIR}
-rm -rf ${STAGE2_LIBCXX_UBSAN_DIR}
-rm -rf ${STAGE2_MSAN_DIR}
-rm -rf ${STAGE3_MSAN_DIR}
-rm -rf ${STAGE2_ASAN_DIR}
-rm -rf ${STAGE3_ASAN_DIR}
-rm -rf ${STAGE2_UBSAN_DIR}
+# rm -rf ${STAGE2_LIBCXX_MSAN_DIR}
+# rm -rf ${STAGE2_LIBCXX_ASAN_DIR}
+# rm -rf ${STAGE2_LIBCXX_UBSAN_DIR}
+# rm -rf ${STAGE2_MSAN_DIR}
+# rm -rf ${STAGE3_MSAN_DIR}
+# rm -rf ${STAGE2_ASAN_DIR}
+# rm -rf ${STAGE3_ASAN_DIR}
+# rm -rf ${STAGE2_UBSAN_DIR}
 
 echo @@@BUILD_STEP update@@@
 buildbot_update
 
+echo @@@BUILD_STEP update zlib@@@
+git -C $ZLIB pull --rebase || git clone  https://github.com/madler/zlib.git $ZLIB || echo @@@STEP_FAILURE@@@
+
 # Stage 1
 
 echo @@@BUILD_STEP build stage1 clang@@@
@@ -58,6 +67,12 @@ build_stage2_msan
 
 check_stage2_msan
 
+build_symbolizer "${STAGE2_MSAN_DIR}"
+
+check_stage2_msan
+
+exit 1
+
 # Stage 3 / MemorySanitizer
 
 echo @@@BUILD_STEP build stage3/msan clang@@@




More information about the llvm-commits mailing list