[zorg] r243678 - [asan] Make errors in Android build/test steps fatal.

[Evgeniy Stepanov]

Author: eugenis
Date: Thu Jul 30 14:58:35 2015
New Revision: 243678

URL: http://llvm.org/viewvc/llvm-project?rev=243678&view=rev
Log:
[asan] Make errors in Android build/test steps fatal.

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

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=243678&r1=243677&r2=243678&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Thu Jul 30 14:58:35 2015
@@ -23,8 +23,8 @@ function build_llvm_symbolizer { # ARCH
         -DLLVM_BUILD_RUNTIME=OFF \
         -DLLVM_TABLEGEN=$ROOT/llvm_build64/bin/llvm-tblgen \
         ${CMAKE_COMMON_OPTIONS} \
-        $LLVM_CHECKOUT || echo @@@STEP_WARNINGS@@@
-    ninja llvm-symbolizer || echo @@@STEP_WARNINGS@@@
+        $LLVM_CHECKOUT || echo @@@STEP_FAILURE@@@
+    ninja llvm-symbolizer || echo @@@STEP_FAILURE@@@
 
     cd ..
 }
@@ -59,10 +59,10 @@ function build_compiler_rt { # ARCH trip
         -DCOMPILER_RT_OUTPUT_DIR="$ANDROID_LIBRARY_OUTPUT_DIR" \
         -DCOMPILER_RT_EXEC_OUTPUT_DIR="$ANDROID_EXEC_OUTPUT_DIR" \
         ${CMAKE_COMMON_OPTIONS} \
-        $LLVM_CHECKOUT/projects/compiler-rt || echo @@@STEP_WARNINGS@@@
-    ninja asan || echo @@@STEP_WARNINGS@@@
+        $LLVM_CHECKOUT/projects/compiler-rt || echo @@@STEP_FAILURE@@@
+    ninja asan || echo @@@STEP_FAILURE@@@
     ls "$ANDROID_LIBRARY_OUTPUT_DIR"
-    ninja AsanUnitTests SanitizerUnitTests || echo @@@STEP_WARNINGS@@@
+    ninja AsanUnitTests SanitizerUnitTests || echo @@@STEP_FAILURE@@@
 
     cd ..
 }

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=243678&r1=243677&r2=243678&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Thu Jul 30 14:58:35 2015
@@ -221,6 +221,6 @@ if [ $BUILD_ANDROID == 1 ] ; then
 fi
 
 if [ $RUN_ANDROID == 1 ] ; then
-    test_android arm armeabi-v7a @@@STEP_WARNINGS@@@
+    test_android arm armeabi-v7a @@@STEP_FAILURE@@@
 #    test_android x86 x86 @@@STEP_WARNINGS@@@
 fi