Skip to content

Commit 2d2f834

Browse files
committed
Fix AVD creation for Android UI tests
1 parent 17f8060 commit 2d2f834

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

scripts/build-android-app.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,17 @@ create_avd() {
350350
fi
351351
rm -rf "$avd_dir"
352352
mkdir -p "$avd_dir"
353-
ANDROID_AVD_HOME="$avd_dir" \
354-
printf 'no\n' | "$manager" create avd -n "$name" -k "$image" --device "pixel_6" --force >/dev/null
353+
if ! ANDROID_AVD_HOME="$avd_dir" "$manager" create avd -n "$name" -k "$image" --device "pixel_6" --force >/dev/null <<<'no'
354+
then
355+
ba_log "Failed to create Android Virtual Device $name using image $image" >&2
356+
find "$avd_dir" -maxdepth 2 -mindepth 1 -print | sed 's/^/[build-android-app] AVD: /' >&2 || true
357+
exit 1
358+
fi
359+
if [ ! -f "$avd_dir/$name.ini" ]; then
360+
ba_log "AVD $name was created but configuration file $avd_dir/$name.ini is missing" >&2
361+
find "$avd_dir" -maxdepth 1 -mindepth 1 -print | sed 's/^/[build-android-app] AVD: /' >&2 || true
362+
exit 1
363+
fi
355364
}
356365

357366
wait_for_emulator() {

0 commit comments

Comments
 (0)