---

yaml
---
r: 65497
b: refs/heads/master
c: 0521d54
h: refs/heads/master
i:
  65495: f5a4dae
v: v3

Author: yichoi

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: fe1dc3280f63fe4cec441837ae20020cbe26dc61
+refs/heads/master: 0521d54ca1e194ba8564f4a000c50b7f708022ba
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/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); }
 //    }
 

trunk/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