[zorg] r307011 - [sanitizers] Fix parallel logging

[Vitaly Buka via llvm-commits]

Author: vitalybuka
Date: Mon Jul  3 02:46:33 2017
New Revision: 307011

URL: http://llvm.org/viewvc/llvm-project?rev=307011&view=rev
Log:
[sanitizers] Fix parallel logging

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=307011&r1=307010&r2=307011&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 02:46:33 2017
@@ -144,19 +144,13 @@ function test_android {
   echo @@@BUILD_STEP run tests@@@
   ANDROID_DEVICES=$(${ADB} devices | grep 'device$' | awk '{print $1}')
 
-  local _counter=0
+  rm -rf test_android_*.log
   for SERIAL in $ANDROID_DEVICES; do
-    (test_on_device "$SERIAL" _tested $@ 2>&1 > test_device_${_counter}.log) &
-    counter=$((counter+1))
+    (test_on_device "$SERIAL" _tested $@ 2>&1 > $(mktemp test_android_XXXX.log)) &
   done
 
   wait
-
-  counter=0
-  for SERIAL in $ANDROID_DEVICES; do
-    cat test_device_${_counter}.log
-    counter=$((counter+1))
-  done
+  find -name test_android_*.log | xargs cat
 
   for _arg in "$@"; do
     if [[ ${_tested["$_arg"]} != 1 ]]; then