From c831bc6cd8b83f3b752e9ac44d5c3c0093256802 Mon Sep 17 00:00:00 2001 From: Erik Date: Mon, 19 Sep 2022 22:33:06 +0000 Subject: [PATCH 1/2] Use fuchsia_component --- .../dart_jit_echo_server/BUILD.gn | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart_jit_echo_server/BUILD.gn diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart_jit_echo_server/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart_jit_echo_server/BUILD.gn new file mode 100644 index 0000000000000..237accf7eea9a --- /dev/null +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart_jit_echo_server/BUILD.gn @@ -0,0 +1,45 @@ +# Copyright 2013 The Flutter Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +import("//build/fuchsia/sdk.gni") + +import("//flutter/tools/fuchsia/dart/dart_component.gni") +import("//flutter/tools/fuchsia/dart/dart_library.gni") +import("//flutter/tools/fuchsia/gn-sdk/package.gni") + +dart_library("lib") { + testonly = true + package_name = "dart_jit_echo_server" + null_safe = true + + source_dir = "." + sources = [ "main.dart" ] + + deps = [ + "//flutter/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo:echo", + "//flutter/tools/fuchsia/dart:fidl", + "//flutter/tools/fuchsia/dart:fuchsia_services", + "//flutter/tools/fuchsia/fidl:fuchsia.logger", + "//flutter/tools/fuchsia/fidl:fuchsia.test", + ] +} + +# Dart component that launches a simple "Hello World" application using JIT +dart_component("component") { + testonly = true + null_safe = true + + manifest = "meta/dart-jit-echo-server.cml" + main_package = "dart_jit_echo_server" + component_name = "dart_jit_echo_server" + + deps = [ ":lib" ] +} + +fuchsia_component("package") { + testonly = true + #package_name = "dart_jit_echo_server" + deps = [ ":component" ] + manifest = "meta/dart-jit-echo-server.cml" +} From d28e51225bedcbe2978768ce16652327f5409168 Mon Sep 17 00:00:00 2001 From: naudzghebre Date: Mon, 7 Nov 2022 20:45:45 +0000 Subject: [PATCH 2/2] [fuchsia-sdk-roll] Hermetic packaging is flipped on by default. Add test_manager package to the tests facets. --- .../meta/dart-aot-runner-integration-test.cml | 10 +++++ .../dart_jit_echo_server/BUILD.gn | 45 ------------------- .../meta/dart-jit-runner-integration-test.cml | 10 +++++ .../embedder/meta/flutter-embedder-test.cml | 15 +++++++ .../mouse-input/meta/mouse-input-test.cml | 17 +++++++ .../text-input/meta/text-input-test.cml | 12 +++++ .../touch-input/meta/touch-input-test.cml | 14 ++++++ 7 files changed, 78 insertions(+), 45 deletions(-) delete mode 100644 shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart_jit_echo_server/BUILD.gn diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml index 9ef643ec9a9c6..1dff27943eedf 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_aot_runner/meta/dart-aot-runner-integration-test.cml @@ -37,4 +37,14 @@ to: "#realm_builder", }, ], + // TODO(https://fxbug.dev/114584): Figure out how to bring these in as deps (if possible oot). + facets: { + "fuchsia.test": { + "deprecated-allowed-packages": [ + "dart_aot_echo_server", + "test_manager", + "oot_dart_aot_runner" + ], + }, + }, } diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart_jit_echo_server/BUILD.gn b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart_jit_echo_server/BUILD.gn deleted file mode 100644 index 237accf7eea9a..0000000000000 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/dart_jit_echo_server/BUILD.gn +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2013 The Flutter Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -import("//build/fuchsia/sdk.gni") - -import("//flutter/tools/fuchsia/dart/dart_component.gni") -import("//flutter/tools/fuchsia/dart/dart_library.gni") -import("//flutter/tools/fuchsia/gn-sdk/package.gni") - -dart_library("lib") { - testonly = true - package_name = "dart_jit_echo_server" - null_safe = true - - source_dir = "." - sources = [ "main.dart" ] - - deps = [ - "//flutter/shell/platform/fuchsia/dart_runner/tests/fidl/flutter.example.echo:echo", - "//flutter/tools/fuchsia/dart:fidl", - "//flutter/tools/fuchsia/dart:fuchsia_services", - "//flutter/tools/fuchsia/fidl:fuchsia.logger", - "//flutter/tools/fuchsia/fidl:fuchsia.test", - ] -} - -# Dart component that launches a simple "Hello World" application using JIT -dart_component("component") { - testonly = true - null_safe = true - - manifest = "meta/dart-jit-echo-server.cml" - main_package = "dart_jit_echo_server" - component_name = "dart_jit_echo_server" - - deps = [ ":lib" ] -} - -fuchsia_component("package") { - testonly = true - #package_name = "dart_jit_echo_server" - deps = [ ":component" ] - manifest = "meta/dart-jit-echo-server.cml" -} diff --git a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml index 9ef643ec9a9c6..d9b4faee723de 100644 --- a/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml +++ b/shell/platform/fuchsia/dart_runner/tests/startup_integration_test/dart_jit_runner/meta/dart-jit-runner-integration-test.cml @@ -37,4 +37,14 @@ to: "#realm_builder", }, ], + // TODO(https://fxbug.dev/114584): Figure out how to bring these in as deps (if possible oot). + facets: { + "fuchsia.test": { + "deprecated-allowed-packages": [ + "dart_jit_echo_server", + "test_manager", + "oot_dart_jit_runner" + ], + }, + }, } diff --git a/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml b/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml index 9bf50e3de8166..8ff1e67899ae9 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml +++ b/shell/platform/fuchsia/flutter/tests/integration/embedder/meta/flutter-embedder-test.cml @@ -27,4 +27,19 @@ to: "#realm_builder", }, ], + // TODO(https://fxbug.dev/114584): Figure out how to bring these in as deps (if possible oot). + facets: { + "fuchsia.test": { + "deprecated-allowed-packages": [ + "child-view", + "oot_flutter_aot_runner", + "oot_flutter_jit_runner", + "oot_flutter_jit_product_runner", + "oot_flutter_aot_product_runner", + "parent-view", + "test-ui-stack", + "test_manager", + ], + }, + }, } diff --git a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml index a2994117bd742..0c4de88067b4d 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/meta/mouse-input-test.cml @@ -52,4 +52,21 @@ to: "#realm_builder", }, ], + // TODO(https://fxbug.dev/114584): Figure out how to bring these in as deps (if possible oot). + facets: { + "fuchsia.test": { + "deprecated-allowed-packages": [ + "child-view", + "cursor", + "flatland-scene-manager-test-ui-stack", + "mouse-input-view", + "oot_flutter_aot_runner", + "oot_flutter_jit_runner", + "oot_flutter_jit_product_runner", + "oot_flutter_aot_product_runner", + "test_manager", + "test-ui-stack", + ], + }, + }, } diff --git a/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml b/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml index faab9ced7a451..48680f9d4a6b0 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml +++ b/shell/platform/fuchsia/flutter/tests/integration/text-input/meta/text-input-test.cml @@ -39,4 +39,16 @@ to: "#realm_builder", }, ], + // TODO(https://fxbug.dev/114584): Figure out how to bring these in as deps (if possible oot). + facets: { + "fuchsia.test": { + "deprecated-allowed-packages": [ + "oot_flutter_aot_runner", + "oot_flutter_jit_runner", + "oot_flutter_jit_product_runner", + "oot_flutter_aot_product_runner", + "test_manager", + ], + }, + }, } diff --git a/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml b/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml index ce02849484a52..679dd484b9130 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml +++ b/shell/platform/fuchsia/flutter/tests/integration/touch-input/meta/touch-input-test.cml @@ -50,4 +50,18 @@ to: "#realm_builder", }, ], + // TODO(https://fxbug.dev/114584): Figure out how to bring these in as deps (if possible oot). + facets: { + "fuchsia.test": { + "deprecated-allowed-packages": [ + "gfx-root-presenter-test-ui-stack", + "oot_flutter_aot_runner", + "oot_flutter_jit_runner", + "oot_flutter_jit_product_runner", + "oot_flutter_aot_product_runner", + "test_manager", + "touch-input-view", + ], + }, + }, }