Skip to content

Commit

Permalink
Stop looping on error waiting for android test results
Browse files Browse the repository at this point in the history
These seem to be causing iloops on the bots. Let's rather see the errors.
  • Loading branch information
brson committed Feb 14, 2014
1 parent a06ce0c commit 6784179
Showing 1 changed file with 2 additions and 16 deletions.
18 changes: 2 additions & 16 deletions src/etc/adb_run_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand All @@ -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

Expand Down

5 comments on commit 6784179

@bors
Copy link
Contributor

@bors bors commented on 6784179 Feb 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at brson@6784179

@bors
Copy link
Contributor

@bors bors commented on 6784179 Feb 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging brson/rust/android = 6784179 into auto

@bors
Copy link
Contributor

@bors bors commented on 6784179 Feb 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brson/rust/android = 6784179 merged ok, testing candidate = 8d6fef6

@bors
Copy link
Contributor

@bors bors commented on 6784179 Feb 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 6784179 Feb 14, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 8d6fef6

Please sign in to comment.