diff options
| author | bors <bors@rust-lang.org> | 2014-02-13 21:51:52 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-13 21:51:52 -0800 |
| commit | 8d6fef674dccae39f52aabfe0f77503f2d7fe464 (patch) | |
| tree | e4e5786105023146970b14298abdf1c85209be0c /src | |
| parent | 22c34f3c4cddea33b916eb92f8d7286b02b865a7 (diff) | |
| parent | 67841793522889a9cbcb93ab066ff3b744499e7d (diff) | |
| download | rust-8d6fef674dccae39f52aabfe0f77503f2d7fe464.tar.gz rust-8d6fef674dccae39f52aabfe0f77503f2d7fe464.zip | |
auto merge of #12256 : brson/rust/android, r=alexcrichton
Android bot has been having some problems. A few details in the commits.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiletest/compiletest.rs | 8 | ||||
| -rwxr-xr-x | src/etc/adb_run_wrapper.sh | 18 |
2 files changed, 7 insertions, 19 deletions
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs index 5530c3b9086..970ee535e0b 100644 --- a/src/compiletest/compiletest.rs +++ b/src/compiletest/compiletest.rs @@ -219,12 +219,14 @@ pub fn run_tests(config: &config) { mode_debug_info => { println!("arm-linux-androideabi debug-info \ test uses tcp 5039 port. please reserve it"); - //arm-linux-androideabi debug-info test uses remote debugger - //so, we test 1 task at once - os::setenv("RUST_TEST_TASKS","1"); } _ =>{} } + + //arm-linux-androideabi debug-info test uses remote debugger + //so, we test 1 task at once. + // also trying to isolate problems with adb_run_wrapper.sh ilooping + os::setenv("RUST_TEST_TASKS","1"); } let opts = test_opts(config); diff --git a/src/etc/adb_run_wrapper.sh b/src/etc/adb_run_wrapper.sh index 555944bcff8..81f086fdabd 100755 --- a/src/etc/adb_run_wrapper.sh +++ b/src/etc/adb_run_wrapper.sh @@ -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" ] @@ -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 |