[zorg] r307050 - [sanitizers] Fix sharded test execution

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Mon Jul  3 16:59:05 2017
New Revision: 307050

URL: http://llvm.org/viewvc/llvm-project?rev=307050&view=rev
Log:
[sanitizers] Fix sharded test execution

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=307050&r1=307049&r2=307050&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh (original)
+++ zorg/trunk/zorg/buildbot/builders/sanitizers/buildbot_android_functions.sh Mon Jul  3 16:59:05 2017
@@ -207,19 +207,19 @@ function test_arch_on_device {
   for ((SHARD=0; SHARD < $NUM_SHARDS; SHARD++)); do
     local ENV="GTEST_TOTAL_SHARDS=$NUM_SHARDS GTEST_SHARD_INDEX=$SHARD"
     ( (run_command_on_device "$ENV $DEVICE_ROOT/AsanNoinstTest" || echo @@@STEP_FAILURE@@@) \
-       >$_log_prefix_$SHARD 2>&1 ) &
+       >${_log_prefix}_$SHARD 2>&1 ) &
   done
 
   wait
-  cat $_log_prefix_* || true
+  cat ${_log_prefix}_* || true
 
   local _log_prefix=$(mktemp shards_XXXX_)
   echo @@@BUILD_STEP run instrumented asan tests [$DEVICE_DESCRIPTION]@@@
   for ((SHARD=0; SHARD < $NUM_SHARDS; SHARD++)); do
     local ENV="GTEST_TOTAL_SHARDS=$NUM_SHARDS GTEST_SHARD_INDEX=$SHARD LD_LIBRARY_PATH=$DEVICE_ROOT ASAN_OPTIONS=start_deactivated=1"
     ( (run_command_on_device "$ENV $DEVICE_ROOT/AsanTest" || echo @@@STEP_FAILURE@@@) \
-      >$_log_prefix_$SHARD 2>&1 ) &
+      >${_log_prefix}_$SHARD 2>&1 ) &
   done
   wait
-  cat $_log_prefix_* || true
+  cat ${_log_prefix}_* || true
 }