Skip to content

Commit d4d761b

Browse files
[pigeon] Enable Android emulator tests in CI (#4484)
Enables the new emulator support for the Linux custom package test targets, and enables the emulator-based Android integration tests for Pigeon. Drops the cores from the high-core config (32) to the default (8) since the emulator requires KVM, and there are currently no 32-core KVM machines in the pool. In practice, it appears that this doesn't have much affect on the runtime. Fixes flutter/flutter#111505
1 parent c4a57a0 commit d4d761b

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

.ci.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,15 +239,18 @@ targets:
239239
- name: Linux_android custom_package_tests master
240240
recipe: packages/packages
241241
timeout: 30
242+
dimensions:
243+
kvm: "1"
242244
properties:
243245
add_recipes_cq: "true"
244246
version_file: flutter_master.version
245247
target_file: linux_custom_package_tests.yaml
246-
# Pigeon tests need Andoid deps (thus the Linux_android base) and
247-
# clang-format.
248+
# Pigeon tests need Andoid deps (thus the Linux_android base), emulator,
249+
# and clang-format.
248250
# web_benchmarks needs Chrome.
249251
dependencies: >-
250252
[
253+
{"dependency": "android_virtual_device", "version": "33"},
251254
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
252255
{"dependency": "chrome_and_driver", "version": "version:114.0"}
253256
]
@@ -256,12 +259,15 @@ targets:
256259
- name: Linux_android custom_package_tests stable
257260
recipe: packages/packages
258261
timeout: 30
262+
dimensions:
263+
kvm: "1"
259264
properties:
260265
version_file: flutter_stable.version
261266
target_file: linux_custom_package_tests.yaml
262267
# See comments on 'master' version above.
263268
dependencies: >-
264269
[
270+
{"dependency": "android_virtual_device", "version": "33"},
265271
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
266272
{"dependency": "chrome_and_driver", "version": "version:114.0"}
267273
]

packages/pigeon/tool/run_tests.dart

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -167,11 +167,8 @@ Future<void> main(List<String> args) async {
167167
androidJavaUnitTests,
168168
androidJavaLint,
169169
androidKotlinUnitTests,
170-
// TODO(stuartmorgan): Include these once CI supports running simulator
171-
// tests. Currently these tests aren't run in CI.
172-
// See https://github.com/flutter/flutter/issues/111505.
173-
// androidJavaIntegrationTests,
174-
// androidKotlinIntegrationTests,
170+
androidJavaIntegrationTests,
171+
androidKotlinIntegrationTests,
175172
];
176173
const List<String> macOSHostTests = <String>[
177174
iOSObjCUnitTests,
@@ -198,9 +195,6 @@ Future<void> main(List<String> args) async {
198195
windowsHostTests,
199196
// Tests that are deliberately not included in CI:
200197
<String>[
201-
// See comment in linuxHostTests:
202-
androidJavaIntegrationTests,
203-
androidKotlinIntegrationTests,
204198
// See comments in macOSHostTests:
205199
iOSObjCIntegrationTests,
206200
iOSSwiftIntegrationTests,

0 commit comments

Comments
 (0)