Skip to content

[pigeon] Enable Android emulator tests in CI #4484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 17, 2023
Merged

[pigeon] Enable Android emulator tests in CI #4484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77b2c6d
Add emulator to Linux custom tests
stuartmorgan-g Jul 16, 2023
0bb7709
copypasta
stuartmorgan-g Jul 16, 2023
0e9bf24
Enable tests
stuartmorgan-g Jul 16, 2023
448787b
Merge branch 'main' into pigeon-android-emulator
stuartmorgan-g Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,15 +239,18 @@ targets:
- name: Linux_android custom_package_tests master
recipe: packages/packages
timeout: 30
dimensions:
kvm: "1"
properties:
add_recipes_cq: "true"
version_file: flutter_master.version
target_file: linux_custom_package_tests.yaml
# Pigeon tests need Andoid deps (thus the Linux_android base) and
# clang-format.
# Pigeon tests need Andoid deps (thus the Linux_android base), emulator,
# and clang-format.
# web_benchmarks needs Chrome.
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "chrome_and_driver", "version": "version:114.0"}
]
Expand All @@ -256,12 +259,15 @@ targets:
- name: Linux_android custom_package_tests stable
recipe: packages/packages
timeout: 30
dimensions:
kvm: "1"
properties:
version_file: flutter_stable.version
target_file: linux_custom_package_tests.yaml
# See comments on 'master' version above.
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "chrome_and_driver", "version": "version:114.0"}
]
Expand Down
10 changes: 2 additions & 8 deletions packages/pigeon/tool/run_tests.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,11 +167,8 @@ Future<void> main(List<String> args) async {
androidJavaUnitTests,
androidJavaLint,
androidKotlinUnitTests,
// TODO(stuartmorgan): Include these once CI supports running simulator
// tests. Currently these tests aren't run in CI.
// See https://github.com/flutter/flutter/issues/111505.
// androidJavaIntegrationTests,
// androidKotlinIntegrationTests,
androidJavaIntegrationTests,
androidKotlinIntegrationTests,
];
const List<String> macOSHostTests = <String>[
iOSObjCUnitTests,
Expand All @@ -198,9 +195,6 @@ Future<void> main(List<String> args) async {
windowsHostTests,
// Tests that are deliberately not included in CI:
<String>[
// See comment in linuxHostTests:
androidJavaIntegrationTests,
androidKotlinIntegrationTests,
// See comments in macOSHostTests:
iOSObjCIntegrationTests,
iOSSwiftIntegrationTests,
Expand Down