diff options
| author | bors <bors@rust-lang.org> | 2016-12-29 02:44:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-12-29 02:44:28 +0000 |
| commit | 1d9965b5baa9ffe52ff605aaa5f25d09a5e4568c (patch) | |
| tree | a2bab9a1c3c28d1b4d42b68942d7ce2afcb67451 | |
| parent | 4ecc85beb339aa8089d936e450b0d800bdf580ae (diff) | |
| parent | 35420b0ccbc289d034d60341a349cfc0503988dd (diff) | |
| download | rust-1d9965b5baa9ffe52ff605aaa5f25d09a5e4568c.tar.gz rust-1d9965b5baa9ffe52ff605aaa5f25d09a5e4568c.zip | |
Auto merge of #38619 - alexcrichton:less-android-flaky, r=brson
travis: Attempt to fix Android flakiness There's been some flaky runs on Travis where the Android emulator is having problems staying alive... presumably? For example: * https://travis-ci.org/rust-lang/rust/jobs/186736745 This commit spawns the emulator in the same way as buildbot with `nohup` to hope that it goes into the background successfully, followed by a `wait-for-device` command. I'm not actually sure if this'll fix the problems we're seeing, but I figure it can't hurt to test out.
| -rwxr-xr-x | src/ci/docker/arm-android/start-emulator.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ci/docker/arm-android/start-emulator.sh b/src/ci/docker/arm-android/start-emulator.sh index 93f20b28b86..fcf42c1819e 100755 --- a/src/ci/docker/arm-android/start-emulator.sh +++ b/src/ci/docker/arm-android/start-emulator.sh @@ -11,5 +11,7 @@ set -ex ANDROID_EMULATOR_FORCE_32BIT=true \ - emulator @arm-18 -no-window -partition-size 2047 & + nohup nohup emulator @arm-18 -no-window -partition-size 2047 \ + 0<&- &>/dev/null & +adb wait-for-device exec "$@" |