[zorg] r240704 - Add sanitizer_common test to the Android bot.

[Evgeniy Stepanov]

Author: eugenis
Date: Thu Jun 25 16:48:42 2015
New Revision: 240704

URL: http://llvm.org/viewvc/llvm-project?rev=240704&view=rev
Log:
Add sanitizer_common test to the Android bot.

Modified:
    zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.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=240704&r1=240703&r2=240704&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Thu Jun 25 16:48:42 2015
@@ -120,13 +120,13 @@ function test_android_on_device { # ARCH
 
     (cd $COMPILER_RT_BUILD_DIR && ninja check-asan) || echo $_step_failure
 
-    # echo @@@BUILD_STEP run sanitizer_common tests [$DEVICE_DESCRIPTION]@@@
+    echo @@@BUILD_STEP run sanitizer_common tests [$DEVICE_DESCRIPTION]@@@
 
-    # $ADB push $COMPILER_RT_BUILD_DIR/lib/sanitizer_common/tests/SanitizerTest $DEVICE_ROOT/
+    $ADB push $COMPILER_RT_BUILD_DIR/lib/sanitizer_common/tests/SanitizerTest $DEVICE_ROOT/
 
-    # $ADB shell "$DEVICE_ROOT/SanitizerTest; \
-    #     echo \$? >$DEVICE_ROOT/error_code"
-    # $ADB pull $DEVICE_ROOT/error_code error_code && (exit `cat error_code`) || echo @@@STEP_WARNINGS@@@
+    $ADB shell "$DEVICE_ROOT/SanitizerTest; \
+        echo \$? >$DEVICE_ROOT/error_code"
+    $ADB pull $DEVICE_ROOT/error_code error_code && (exit `cat error_code`) || echo $_step_failure
 
     echo @@@BUILD_STEP run asan tests [$DEVICE_DESCRIPTION]@@@
 
@@ -140,13 +140,13 @@ function test_android_on_device { # ARCH
           GTEST_SHARD_INDEX=$SHARD \
           asanwrapper $DEVICE_ROOT/AsanTest; \
           echo \$? >$DEVICE_ROOT/error_code"
-        $ADB pull $DEVICE_ROOT/error_code error_code && echo && (exit `cat error_code`) || echo @@@STEP_WARNINGS@@@
+        $ADB pull $DEVICE_ROOT/error_code error_code && echo && (exit `cat error_code`) || echo $_step_failure
         $ADB shell " \
           GTEST_TOTAL_SHARDS=$NUM_SHARDS \
           GTEST_SHARD_INDEX=$SHARD \
           $DEVICE_ROOT/AsanNoinstTest; \
           echo \$? >$DEVICE_ROOT/error_code"
-        $ADB pull $DEVICE_ROOT/error_code error_code && echo && (exit `cat error_code`) || echo @@@STEP_WARNINGS@@@
+        $ADB pull $DEVICE_ROOT/error_code error_code && echo && (exit `cat error_code`) || echo $_step_failure
     done
 
     sleep 2