[zorg] r313445 - [sanitizer] Run sanitizer tests on Android bot

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Fri Sep 15 22:17:07 2017
New Revision: 313445

URL: http://llvm.org/viewvc/llvm-project?rev=313445&view=rev
Log:
[sanitizer] Run sanitizer tests on 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=313445&r1=313444&r2=313445&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 15 22:17:07 2017
@@ -70,6 +70,7 @@ function configure_android { # ARCH trip
     -DCMAKE_C_COMPILER=$ROOT/llvm_build64/bin/clang \
     -DCMAKE_CXX_COMPILER=$ROOT/llvm_build64/bin/clang++ \
     -DLLVM_CONFIG_PATH=$ROOT/llvm_build64/bin/llvm-config \
+    -DCOMPILER_RT_BUILD_BUILTINS=OFF \
     -DCOMPILER_RT_INCLUDE_TESTS=ON \
     -DCOMPILER_RT_ENABLE_WERROR=ON \
     -DCMAKE_C_FLAGS="$ANDROID_FLAGS" \
@@ -88,7 +89,7 @@ function build_android {
   wait
   echo @@@BUILD_STEP build android/$_arch@@@
   ninja -C llvm_build_android_$_arch llvm-symbolizer || echo @@@STEP_FAILURE@@@
-  ninja -C compiler_rt_build_android_$_arch asan AsanUnitTests SanitizerUnitTests || echo @@@STEP_FAILURE@@@
+  ninja -C compiler_rt_build_android_$_arch compiler-rt AsanUnitTests SanitizerUnitTests || echo @@@STEP_FAILURE@@@
 }
 
 # If a multiarch device has x86 as the first arch, remove everything else from
@@ -197,6 +198,9 @@ function test_arch_on_device {
   $ADB push $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanNoinstTest $DEVICE_ROOT/ &
   wait
 
+  echo @@@BUILD_STEP run sanitizer lit tests [$DEVICE_DESCRIPTION]@@@
+  (cd $COMPILER_RT_BUILD_DIR && ninja check-sanitizer) || echo @@@STEP_FAILURE@@@
+
   echo @@@BUILD_STEP run asan lit tests [$DEVICE_DESCRIPTION]@@@
   (cd $COMPILER_RT_BUILD_DIR && ninja check-asan) || echo @@@STEP_FAILURE@@@