diff --git a/ci/builders/linux_fuchsia.json b/ci/builders/linux_fuchsia.json index ca1c999c09d56..ea2a496343299 100644 --- a/ci/builders/linux_fuchsia.json +++ b/ci/builders/linux_fuchsia.json @@ -92,25 +92,41 @@ { "drone_dimensions": [ "device_type=none", + "kvm=1", "os=Linux" ], "gclient_variables": { - "download_android_deps": false + "download_android_deps": false, + "run_fuchsia_emu": true }, "gn": [ "--fuchsia", "--fuchsia-cpu", "x64", "--runtime-mode", - "profile" + "profile", + "--no-lto" ], "name": "fuchsia_profile_x64", "ninja": { "config": "fuchsia_profile_x64", "targets": [ - "flutter/shell/platform/fuchsia:fuchsia" + "flutter/shell/platform/fuchsia:fuchsia", + "flutter/shell/platform/fuchsia/dart_runner:dart_runner_tests", + "fuchsia_tests" ] - } + }, + "tests": [ + { + "name": "x64 emulator based profile / aot tests", + "language": "python3", + "script": "flutter/tools/fuchsia/with_envs.py", + "parameters": [ + "testing/fuchsia/run_tests.py", + "fuchsia_profile_x64" + ] + } + ] }, { "drone_dimensions": [ diff --git a/testing/fuchsia/run_tests.py b/testing/fuchsia/run_tests.py index e833329925f1a..d4221d7945bcc 100755 --- a/testing/fuchsia/run_tests.py +++ b/testing/fuchsia/run_tests.py @@ -125,17 +125,12 @@ def _bundled_test_runner_of(target_id: str) -> _BundledTestRunner: log_dir = os.environ.get('FLUTTER_LOGS_DIR', '/tmp/log') with open(os.path.join(os.path.dirname(__file__), 'test_suites.yaml'), 'r') as file: tests = yaml.safe_load(file) - # TODO(zijiehe-google-com): Run tests with dart aot, - # https://github.com/flutter/flutter/issues/140179. - def dart_jit(test) -> bool: - return 'run_with_dart_aot' not in test or test['run_with_dart_aot'] != 'true' - # TODO(zijiehe-google-com): Run all tests in release build, # https://github.com/flutter/flutter/issues/140179. def variant(test) -> bool: return 'variant' not in test or test['variant'] == VARIANT - tests = [t for t in tests if dart_jit(t) and variant(t)] + tests = [t for t in tests if variant(t)] return _BundledTestRunner(target_id, resolve_packages(tests), build_test_cases(tests), log_dir) diff --git a/testing/fuchsia/test_suites.yaml b/testing/fuchsia/test_suites.yaml index c315a8aadf8cd..8f018241a4350 100644 --- a/testing/fuchsia/test_suites.yaml +++ b/testing/fuchsia/test_suites.yaml @@ -54,6 +54,7 @@ emulator_arch: - 'x64' - 'arm64' + variant: fuchsia_profile_x64 - test_command: test run fuchsia-pkg://fuchsia.com/flutter-embedder-test#meta/flutter-embedder-test.cm packages: - flutter-embedder-test-0.far