[llvm-zorg] Exit early (skip tests) if builds failed

[oontvoo]

Summary

This helps reducing the error log.
You don't have to scroll all the way up to see that the test failed because there was no libclang_rt.* files (due to compilation failure in build steps)

[oontvoo]

fixed typo

[vitalybuka]

LGTM either way

zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

121–122

why not exit here?
I suspect probability that one platform build and another don't is almost 0

[oontvoo]

zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

121–122

I think there is enough code behind platform-specific #if-defs that the chance of it breaking in one platform and not the others is not that low :-)

In fact, we've seen that just recently in the lsan patches, no? __aeabi_read_tp missing on arm but not the others

Thanks!

[vitalybuka]

bb93d57ac0d2ecbaaf56dae6268b9e4e1bf32199
19b0dd23e09d1fa902550af206a03b019131bc65

[oontvoo]

In D91808#2408983, @vitalybuka wrote:

bb93d57ac0d2ecbaaf56dae6268b9e4e1bf32199
19b0dd23e09d1fa902550af206a03b019131bc65

Whoops! Sorry about that! And thanks for the fixes!

zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh

function build_stage2_android() {
   echo @@@BUILD_STEP bootstrap clang@@@
   rm_dirs ${STAGE2_CLOBBER}
 
   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@@@
+  ninja -C llvm_build64 || echo @@@STEP_FAILURE@@@ && exit 2
 }
 
 function configure_android { # ARCH triple
   local _arch=$1
   local _triple=$2
 
   ANDROID_TOOLCHAIN=$ROOT/$NDK_DIR/toolchains/llvm/prebuilt/linux-x86_64
   echo "Building for Android API level $ANDROID_API"
(cd compiler_rt_build_android_$_arch && cmake \
     -DCOMPILER_RT_TEST_TARGET_TRIPLE=$_triple \
     -DCOMPILER_RT_OUTPUT_DIR="$ANDROID_LIBRARY_OUTPUT_DIR" \
     -DCOMPILER_RT_EXEC_OUTPUT_DIR="$ANDROID_EXEC_OUTPUT_DIR" \
     -DLLVM_LIT_ARGS="-vv --show-unsupported --show-xfail" \
     ${CMAKE_COMMON_OPTIONS} \
     ${COMPILER_RT_OPTIONS} || echo @@@STEP_FAILURE@@@) &
 }
 
+BUILD_RT_ERR=""
 function build_android {
   local _arch=$1
   wait
   echo @@@BUILD_STEP build android/$_arch@@@
-  ninja -C llvm_build_android_$_arch llvm-symbolizer || echo @@@STEP_FAILURE@@@
-  ninja -C compiler_rt_build_android_$_arch || echo @@@STEP_FAILURE@@@
+  ninja -C llvm_build_android_$_arch llvm-symbolizer || echo @@@STEP_FAILURE@@@ && BUILD_RT_ERR="${BUILD_RT_ERR}|${_arch}|"
+  ninja -C compiler_rt_build_android_$_arch || echo @@@STEP_FAILURE@@@ && BUILD_RT_ERR="${BUILD_RT_ERR}|${_arch}|"
 }
 
 # If a multiarch device has x86 as the first arch, remove everything else from
 # the list. This captures cases like [x86,armeabi-v7a], where the arm part is
 # software emulation and incompatible with ASan.
 function patch_abilist { # IN OUT
   local _abilist=$1
   local _out=$2
function test_on_device {
   local _serial=$1
   shift
 
   ABILIST=$(${ADB} -s $_serial shell getprop ro.product.cpu.abilist)
   patch_abilist $ABILIST ABILIST
   for _arg in "$@"; do
     local _arch=${_arg%:*}
     local _abi=${_arg#*:}
+    if [[ $BUILD_RT_ERR == *"|${_arch}|"* ]]; then
+      echo "@@@STEP_FAILURE@@ skipping tests on ${_arch}"
+      continue
+    fi
     if [[ $ABILIST == *"$_abi"* ]]; then
       echo "$_serial" >> tested_arch_$_arch
       BUILD_ID=$(${ADB} -s $_serial shell getprop ro.build.id | tr -d '\r')
       BUILD_FLAVOR=$(${ADB} -s $_serial shell getprop ro.build.flavor | tr -d '\r')
       test_arch_on_device "$_arch" "$_serial" "$BUILD_ID" "$BUILD_FLAVOR"
     fi
   done
 }