aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVitaly Buka <vitalybuka@google.com>2018-12-20 21:59:47 +0000
committerVitaly Buka <vitalybuka@google.com>2018-12-20 21:59:47 +0000
commit140ed8d60de182232e78993697629e21389c2139 (patch)
treec8af318ea4957bfaf65cbbbbeb096e825f540f9f
parentafb104a12ee46e47ed4122bc33a59113e868e8c4 (diff)
[zorg] Report results of adb push on Android bot
git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@349838 91177308-0d34-0410-b5e6-96231b3b80d8
-rwxr-xr-xzorg/buildbot/builders/sanitizers/buildbot_android_functions.sh18
1 files changed, 12 insertions, 6 deletions
diff --git a/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh b/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
index 1b1a1e11..633e1c3a 100755
--- a/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
+++ b/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh
@@ -197,12 +197,18 @@ function test_arch_on_device {
$ADB shell rm -rf $DEVICE_ROOT
$ADB shell mkdir $DEVICE_ROOT
- $ADB push $SYMBOLIZER_BIN $DEVICE_ROOT/ &
- $ADB push $RT_DIR/libclang_rt.*-android.so $DEVICE_ROOT/ &
- $ADB push $LIBCXX_SHARED $DEVICE_ROOT/ &
- $ADB push $COMPILER_RT_BUILD_DIR/lib/sanitizer_common/tests/SanitizerTest $DEVICE_ROOT/ &
- $ADB push $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanTest $DEVICE_ROOT/ &
- $ADB push $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanNoinstTest $DEVICE_ROOT/ &
+
+ FILES="$SYMBOLIZER_BIN
+ $RT_DIR/libclang_rt.*-android.so
+ $LIBCXX_SHARED
+ $COMPILER_RT_BUILD_DIR/lib/sanitizer_common/tests/SanitizerTest
+ $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanTest
+ $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanNoinstTest"
+
+ for F in $FILES ; do
+ ( $ADB push $F $DEVICE_ROOT/ || echo @@@STEP_FAILURE@@@ )&
+ done
+
wait
echo @@@BUILD_STEP run lit tests [$DEVICE_DESCRIPTION]@@@