diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2016-12-26 11:14:39 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2016-12-26 11:17:19 -0800 |
| commit | 35420b0ccbc289d034d60341a349cfc0503988dd (patch) | |
| tree | 86e1e8f11cf78deede75dbf561b50b3e28918576 | |
| parent | 5752eae5f5ce3517d36f6668619dd2c70e6d2d88 (diff) | |
| download | rust-35420b0ccbc289d034d60341a349cfc0503988dd.tar.gz rust-35420b0ccbc289d034d60341a349cfc0503988dd.zip | |
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 "$@" |