[zorg] r370160 - [sanitizer] Improve clobbering

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Tue Aug 27 20:57:29 2019
New Revision: 370160

URL: http://llvm.org/viewvc/llvm-project?rev=370160&view=rev
Log:
[sanitizer] Improve clobbering

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh?rev=370160&r1=370159&r2=370160&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android.sh Tue Aug 27 20:57:29 2019
@@ -17,8 +17,6 @@ USE_GIT=0
 
 CHECK_LIBCXX=${CHECK_LIBCXX:-1}
 CHECK_LLD=${CHECK_LLD:-1}
-CLOBBER="android_ndk platform-tools"
-STAGE1_CLOBBER="llvm_build64 compiler_rt_build_android_* llvm_build_android_*"
 LLVM=$ROOT/llvm
 CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_PARALLEL_LINK_JOBS=20"
 
@@ -26,12 +24,6 @@ if [ -e /usr/include/plugin-api.h ]; the
   CMAKE_COMMON_OPTIONS="${CMAKE_COMMON_OPTIONS} -DLLVM_BINUTILS_INCDIR=/usr/include"
 fi
 
-export CCACHE_DIR=$ROOT/ccache
-export CCACHE_COMPILERCHECK=content
-if ccache -sM 20 ; then
-  CMAKE_COMMON_OPTIONS="${CMAKE_COMMON_OPTIONS} -DLLVM_CCACHE_BUILD=ON"
-fi
-
 clobber
 
 download_android_tools r16
@@ -45,16 +37,7 @@ buildbot_update
 
 CMAKE_COMMON_OPTIONS="$CMAKE_COMMON_OPTIONS -DLLVM_ENABLE_ASSERTIONS=ON"
 
-# Build self-hosted tree with fresh Clang and -Werror.
-CMAKE_OPTIONS="${CMAKE_COMMON_OPTIONS} -DLLVM_ENABLE_WERROR=ON ${STAGE1_AS_COMPILER} -DCMAKE_C_FLAGS=-gmlt -DCMAKE_CXX_FLAGS=-gmlt"
-
-echo @@@BUILD_STEP bootstrap clang@@@
-mkdir -p llvm_build64
-if  [[ "$(cat llvm_build64/CMAKE_OPTIONS)" != "${CMAKE_OPTIONS}" ]] ; then
-  (cd llvm_build64 && cmake ${CMAKE_OPTIONS} -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON $LLVM && \
-     echo ${CMAKE_OPTIONS} > CMAKE_OPTIONS) || echo @@@STEP_FAILURE@@@
-fi
-ninja -C llvm_build64 || echo @@@STEP_FAILURE@@@
+build_clang64
 
 # Android NDK has no iconv.h which is requred by LIBXML2.
 CMAKE_COMMON_OPTIONS="${CMAKE_COMMON_OPTIONS} -DLLVM_LIBXML2_ENABLED=OFF"

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh?rev=370160&r1=370159&r2=370160&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Tue Aug 27 20:57:29 2019
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+CLOBBER="android_ndk platform-tools *.zip shards_* test_android_* tested_arch_*"
+STAGE1_CLOBBER="llvm_build64 compiler_rt_build_android_* llvm_build_android_*"
+
 function download_android_tools {
   local VERSION=android-ndk-$1
   local FILE_NAME=${VERSION}-linux-x86_64.zip
@@ -26,6 +29,19 @@ function download_android_tools {
   export PATH=$ROOT/platform-tools/:$PATH
 }
 
+function build_clang64() {
+  # Build self-hosted tree with fresh Clang and -Werror.
+  local CMAKE_OPTIONS="${CMAKE_COMMON_OPTIONS} -DLLVM_ENABLE_WERROR=ON ${STAGE1_AS_COMPILER} -DCMAKE_C_FLAGS=-gmlt -DCMAKE_CXX_FLAGS=-gmlt"
+
+  echo @@@BUILD_STEP bootstrap clang@@@
+  mkdir -p llvm_build64
+  if  [[ "$(cat llvm_build64/CMAKE_OPTIONS)" != "${CMAKE_OPTIONS}" ]] ; then
+    (cd llvm_build64 && cmake ${CMAKE_OPTIONS} -DLLVM_BUILD_EXTERNAL_COMPILER_RT=ON $LLVM && \
+       echo ${CMAKE_OPTIONS} > CMAKE_OPTIONS) || echo @@@STEP_FAILURE@@@
+  fi
+  ninja -C llvm_build64 || echo @@@STEP_FAILURE@@@
+}
+
 function build_android_ndk {
   local NDK_DIR=android_ndk
   local _arch=$1

Modified: zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh?rev=370160&r1=370159&r2=370160&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Tue Aug 27 20:57:29 2019
@@ -16,12 +16,12 @@ ARCH=`uname -m`
 export PATH="/usr/local/bin:$PATH"
 export ANDROID_SDK_HOME=$ROOT/../../..
 
-CLOBBER="zlib clang_build"
-clobber
-
 # Always clobber bootstrap build trees.
 rm -rf compiler_rt_build llvm_build64 llvm_build_ninja symbolizer_build*
 
+CLOBBER="zlib clang_build"
+clobber
+
 SUPPORTS_32_BITS=${SUPPORTS_32_BITS:-1}
 MAKE_JOBS=${MAX_MAKE_JOBS:-$(nproc)}
 LLVM=$ROOT/llvm

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=370160&r1=370159&r2=370160&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_fuzzer.sh Tue Aug 27 20:57:29 2019
@@ -23,7 +23,7 @@ LIBFUZZER=$LLVM/lib/Fuzzer
 CMAKE_COMMON_OPTIONS="-GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=OFF -DLLVM_PARALLEL_LINK_JOBS=8 -DLIBFUZZER_ENABLE_TESTS=ON"
 
 CLOBBER=fuzzer-test-suite
-STAGE1_CLOBBER="RUNDIR-*"
+STAGE1_CLOBBER="RUNDIR-* $LIBFUZZER"
 clobber
 
 # Make sure asan intercepts SIGABRT so that the fuzzer can print the test cases