+# Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+#
+# ignore-tidy-linelength
#
# 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
-PATH=$1
-if [ -d "$PATH" ]
+TEST_PATH=$1
+BIN_PATH=/system/bin
+if [ -d "$TEST_PATH" ]
then
shift
RUN=$1
then
shift
- L_RET=1
- L_COUNT=0
- cd $PATH
- while [ $L_RET -eq 1 ]
- do
- TEST_EXEC_ENV=22 LD_LIBRARY_PATH=$PATH $PATH/$RUN $@ 1>$PATH/$RUN.stdout 2>$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
+ cd $TEST_PATH
+ 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 > $PATH/$RUN.exitcode
+ echo $L_RET > $TEST_PATH/$RUN.exitcode
fi
fi