[zorg] r246867 - [asan] Enable testing on Android/x86.

[Evgeniy Stepanov via llvm-commits]

Author: eugenis
Date: Fri Sep  4 15:31:05 2015
New Revision: 246867

URL: http://llvm.org/viewvc/llvm-project?rev=246867&view=rev
Log:
[asan] Enable testing on Android/x86.

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=246867&r1=246866&r2=246867&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Fri Sep  4 15:31:05 2015
@@ -67,6 +67,17 @@ function build_compiler_rt { # ARCH trip
     cd ..
 }
 
+# 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
+    if [[ "$_abilist" == "x86,"* ]]; then
+      _abilist="x86"
+    fi
+    eval $_out="'$_abilist'"
+}
 
 function test_android { # ARCH ABI STEP_FAILURE
     local _arch=$1
@@ -75,6 +86,7 @@ function test_android { # ARCH ABI STEP_
     ANDROID_DEVICES=$(adb devices | grep 'device$' | awk '{print $1}')
     for SERIAL in $ANDROID_DEVICES; do
       ABILIST=$(adb -s $SERIAL shell getprop ro.product.cpu.abilist)
+      patch_abilist $ABILIST ABILIST
       if [[ $ABILIST == *"$_abi"* ]]; then
         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')

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=246867&r1=246866&r2=246867&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Fri Sep  4 15:31:05 2015
@@ -222,5 +222,5 @@ fi
 
 if [ $RUN_ANDROID == 1 ] ; then
     test_android arm armeabi-v7a @@@STEP_FAILURE@@@
-#    test_android x86 x86 @@@STEP_WARNINGS@@@
+    test_android x86 x86 @@@STEP_WARNINGS@@@
 fi