From a06ce0c91fac04c74a76b8fdcf89c19407af8e6a Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 13 Feb 2014 21:17:02 -0800
Subject: [PATCH 1/2] compiletest: Run all android tests serially

This is an attempt to isolate test failures on the bots. It may also
eliminate problems with the emulators breaking by reducing the chance
of OOM.
---
 src/compiletest/compiletest.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 5530c3b9086..970ee535e0b 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -219,12 +219,14 @@ pub fn run_tests(config: &config) {
             mode_debug_info => {
                 println!("arm-linux-androideabi debug-info \
                          test uses tcp 5039 port. please reserve it");
-                //arm-linux-androideabi debug-info test uses remote debugger
-                //so, we test 1 task at once
-                os::setenv("RUST_TEST_TASKS","1");
             }
             _ =>{}
         }
+
+        //arm-linux-androideabi debug-info test uses remote debugger
+        //so, we test 1 task at once.
+        // also trying to isolate problems with adb_run_wrapper.sh ilooping
+        os::setenv("RUST_TEST_TASKS","1");
     }
 
     let opts = test_opts(config);

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 2/2] 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