auto merge of #12256 : brson/rust/android, r=alexcrichton

Android bot has been having some problems. A few details in the commits.

Author: bors

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);

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