[zorg] r222836 - [asan] Switch asan-android tests from arm to armv7.

[Evgeniy Stepanov]

Author: eugenis
Date: Wed Nov 26 09:47:07 2014
New Revision: 222836

URL: http://llvm.org/viewvc/llvm-project?rev=222836&view=rev
Log:
[asan] Switch asan-android tests from arm to armv7.

Workaround for https://code.google.com/p/android/issues/detail?id=68779.

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=222836&r1=222835&r2=222836&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Wed Nov 26 09:47:07 2014
@@ -53,7 +53,7 @@ function build_compiler_rt { # ARCH trip
         -DCMAKE_CXX_FLAGS="$ANDROID_FLAGS" \
         -DANDROID=1 \
         -DCOMPILER_RT_TEST_COMPILER_CFLAGS="$ANDROID_FLAGS" \
-        -DCOMPILER_RT_TEST_TARGET_TRIPLE=arm-linux-androideabi \
+        -DCOMPILER_RT_TEST_TARGET_TRIPLE=$_triple \
         -DCOMPILER_RT_OUTPUT_DIR="$ANDROID_LIBRARY_OUTPUT_DIR" \
         -DCOMPILER_RT_EXEC_OUTPUT_DIR="$ANDROID_EXEC_OUTPUT_DIR" \
         ${CMAKE_COMMON_OPTIONS} \

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=222836&r1=222835&r2=222836&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_cmake.sh Wed Nov 26 09:47:07 2014
@@ -177,6 +177,8 @@ fi
 
 if [ $RUN_ANDROID == 1 ] ; then
     trap "android_emulator_cleanup" EXIT
-    test_android arm arm-K @@@STEP_FAILURE@@@
+    # Testing armv7 instead of plain arm to work around
+    # https://code.google.com/p/android/issues/detail?id=68779
+    test_android armv7 arm-K @@@STEP_FAILURE@@@
     test_android x86 x86-K @@@STEP_WARNINGS@@@
 fi