Skip to content

Commit 1d9965b

Browse files
committed
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.
2 parents 4ecc85b + 35420b0 commit 1d9965b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/ci/docker/arm-android/start-emulator.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,7 @@
1111

1212
set -ex
1313
ANDROID_EMULATOR_FORCE_32BIT=true \
14-
emulator @arm-18 -no-window -partition-size 2047 &
14+
nohup nohup emulator @arm-18 -no-window -partition-size 2047 \
15+
0<&- &>/dev/null &
16+
adb wait-for-device
1517
exec "$@"

0 commit comments

Comments
 (0)