From 67841793522889a9cbcb93ab066ff3b744499e7d Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 13 Feb 2014 21:19:06 -0800
Subject: [PATCH] Stop looping on error waiting for android test results

These seem to be causing iloops on the bots. Let's rather see the errors.
---
 src/etc/adb_run_wrapper.sh | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/etc/adb_run_wrapper.sh b/src/etc/adb_run_wrapper.sh
index 555944bcff8..81f086fdabd 100755
--- a/src/etc/adb_run_wrapper.sh
+++ b/src/etc/adb_run_wrapper.sh
@@ -2,9 +2,6 @@
 # usage : adb_run_wrapper [test dir - where test executables exist] [test executable]
 #
 
-# Sometimes android shell produce exitcode "1 : Text File Busy"
-# Retry after $WAIT seconds, expecting resource cleaned-up
-WAIT=10
 TEST_PATH=$1
 BIN_PATH=/system/bin
 if [ -d "$TEST_PATH" ]
@@ -16,20 +13,9 @@ then
     then
         shift
 
-        L_RET=1
-        L_COUNT=0
         cd $TEST_PATH
-        while [ $L_RET -eq 1 ]
-        do
-            TEST_EXEC_ENV=22 LD_LIBRARY_PATH=$TEST_PATH PATH=$BIN_PATH:$TEST_PATH $TEST_PATH/$RUN $@ 1>$TEST_PATH/$RUN.stdout 2>$TEST_PATH/$RUN.stderr
-            L_RET=$?
-            if [ $L_COUNT -gt 0 ]
-            then
-               /system/bin/sleep $WAIT
-               /system/bin/sync
-            fi
-            L_COUNT=$((L_COUNT+1))
-        done
+        TEST_EXEC_ENV=22 LD_LIBRARY_PATH=$TEST_PATH PATH=$BIN_PATH:$TEST_PATH $TEST_PATH/$RUN $@ 1>$TEST_PATH/$RUN.stdout 2>$TEST_PATH/$RUN.stderr
+        L_RET=$?
 
         echo $L_RET > $TEST_PATH/$RUN.exitcode