Skip to content

Commit 6784179

Browse files
committed
Stop looping on error waiting for android test results
These seem to be causing iloops on the bots. Let's rather see the errors.
1 parent a06ce0c commit 6784179

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

src/etc/adb_run_wrapper.sh

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
# usage : adb_run_wrapper [test dir - where test executables exist] [test executable]
33
#
44

5-
# Sometimes android shell produce exitcode "1 : Text File Busy"
6-
# Retry after $WAIT seconds, expecting resource cleaned-up
7-
WAIT=10
85
TEST_PATH=$1
96
BIN_PATH=/system/bin
107
if [ -d "$TEST_PATH" ]
@@ -16,20 +13,9 @@ then
1613
then
1714
shift
1815

19-
L_RET=1
20-
L_COUNT=0
2116
cd $TEST_PATH
22-
while [ $L_RET -eq 1 ]
23-
do
24-
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
25-
L_RET=$?
26-
if [ $L_COUNT -gt 0 ]
27-
then
28-
/system/bin/sleep $WAIT
29-
/system/bin/sync
30-
fi
31-
L_COUNT=$((L_COUNT+1))
32-
done
17+
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
18+
L_RET=$?
3319

3420
echo $L_RET > $TEST_PATH/$RUN.exitcode
3521

0 commit comments

Comments
 (0)