Skip to content

Commit

Permalink
Auto merge of #38619 - alexcrichton:less-android-flaky, r=brson
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bors committed Dec 29, 2016
2 parents 4ecc85b + 35420b0 commit 1d9965b
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/ci/docker/arm-android/start-emulator.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 "$@"

0 comments on commit 1d9965b

Please sign in to comment.