[zorg] r306910 - [asan] We should not need asanwrapper with current build scripts

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Fri Jun 30 16:04:05 2017
New Revision: 306910

URL: http://llvm.org/viewvc/llvm-project?rev=306910&view=rev
Log:
[asan] We should not need asanwrapper with current build scripts

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=306910&r1=306909&r2=306910&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Fri Jun 30 16:04:05 2017
@@ -195,17 +195,12 @@ function test_android_on_device { # ARCH
   $ADB pull $DEVICE_ROOT/error_code error_code && (exit `cat error_code`) || echo $_step_failure
 
   echo @@@BUILD_STEP run asan tests [$DEVICE_DESCRIPTION]@@@
-  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; \
+      $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 " \