[zorg] r252974 - [asan] Fix the aarch64/android bot not to use asanwrapper.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Thu Nov 12 18:17:27 2015
New Revision: 252974

URL: http://llvm.org/viewvc/llvm-project?rev=252974&view=rev
Log:
[asan] Fix the aarch64/android bot not to use asanwrapper.

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=252974&r1=252973&r2=252974&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Thu Nov 12 18:17:27 2015
@@ -157,12 +157,18 @@ function test_android_on_device { # ARCH
     $ADB push $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanTest $DEVICE_ROOT/
     $ADB push $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanNoinstTest $DEVICE_ROOT/
 
+    if [[ $_arch == aarch64 || $_arch == x86_64 ]]; then
+      ASANWRAPPER=
+    else
+      ASANWRAPPER=asanwrapper
+    fi
+
     NUM_SHARDS=7
     for ((SHARD=0; SHARD < $NUM_SHARDS; SHARD++)); do
         $ADB shell "ASAN_OPTIONS=start_deactivated=1 \
           GTEST_TOTAL_SHARDS=$NUM_SHARDS \
           GTEST_SHARD_INDEX=$SHARD \
-          asanwrapper $DEVICE_ROOT/AsanTest; \
+          $ASANWRAPPER $DEVICE_ROOT/AsanTest; \
           echo \$? >$DEVICE_ROOT/error_code"
         $ADB pull $DEVICE_ROOT/error_code error_code && echo && (exit `cat error_code`) || echo $_step_failure
         $ADB shell " \