etc: adb_run_wrapper argument change

diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 61371dd94d6c7292fd6204b2dffb4f53a199ff58..0c899b0435dbf3c65a8737fca937a3d845e0c242 100644 (file)
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -768,6 +768,7 @@ fn _arm_exec_compiled_test(config: &config, props: &TestProps,
 
         runargs.push(~"shell");
         runargs.push(fmt!("%s/adb_run_wrapper.sh", config.adb_test_dir));
+        runargs.push(fmt!("%s", config.adb_test_dir));
         runargs.push(fmt!("%s", prog_short));
 
         for args.args.each |tv| {
@@ -795,7 +796,7 @@ fn _arm_exec_compiled_test(config: &config, props: &TestProps,
                 _ => 0,
             }
         }
-        maxtry = maxtry - 1;
+//        maxtry = maxtry - 1;
 //        unsafe { libc::sleep(1); }
 //    }
 

diff --git a/src/etc/adb_run_wrapper.sh b/src/etc/adb_run_wrapper.sh
index 7d5fdb1cdd1753f2128ba875b662fe1096242912..516c6a9fca32ac61386b9869bc81d3abacc3db0e 100755 (executable)
--- a/src/etc/adb_run_wrapper.sh
+++ b/src/etc/adb_run_wrapper.sh
@@ -1,17 +1,23 @@
-
-PATH=$(echo $0 | sed 's#/[^/]*$##')
-RUN=$1
-
-if [ ! -z "$RUN" ]
+#
+# usage : adb_run_wrapper [test dir - where test executables exist] [test executable]
+#
+PATH=$1
+if [ -d "$PATH" ]
 then
     shift
-    while [ -f $PATH/lock ]
-    do
-        sleep 1
-    done
-    touch $PATH/lock
-       LD_LIBRARY_PATH=$PATH $PATH/$RUN $@ 1>$PATH/$RUN.stdout 2>$PATH/$RUN.stderr
-       echo $? > $PATH/$RUN.exitcode
-    /system/bin/rm $PATH/lock
-fi
+    RUN=$1
 
+    if [ ! -z "$RUN" ]
+    then
+        shift
+        while [ -f $PATH/lock ]
+        do
+            /system/bin/sleep 1
+        done
+        /system/bin/touch $PATH/lock
+        LD_LIBRARY_PATH=$PATH $PATH/$RUN $@ 1>$PATH/$RUN.stdout 2>$PATH/$RUN.stderr
+        echo $? > $PATH/$RUN.exitcode
+        /system/bin/rm $PATH/lock
+        /system/bin/sync
+    fi
+fi