From 1f8da1c3e40ee975f523f269835ff7f4832d2215 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 a5b7da04b25e799d5164d9a244f8416e1e9f9891 Mon Sep 17 00:00:00 2001 From: naudzghebre Date: Tue, 8 Nov 2022 20:51:44 +0000 Subject: [PATCH 2/2] [mouse-input] mouse-input-view doc nits and add mouse-input-test to the run_integration_test.sh script --- .../dart_jit_echo_server/BUILD.gn | 45 ------------------- .../tests/integration/mouse-input/README.md | 8 ++-- .../fuchsia/devshell/run_integration_test.sh | 3 ++ 3 files changed, 6 insertions(+), 50 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_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/flutter/tests/integration/mouse-input/README.md b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/README.md index c36111b38633a..0680adb4416c1 100644 --- a/shell/platform/fuchsia/flutter/tests/integration/mouse-input/README.md +++ b/shell/platform/fuchsia/flutter/tests/integration/mouse-input/README.md @@ -31,8 +31,7 @@ fx set workstation_eng.qemu-x64 && fx build Build flutter/engine ```shell -$ENGINE_DIR/flutter/tools/gn --fuchsia --no-lto && ninja -C $ENGINE_DIR/out/fuchsia_debug_x64 flutter/shell/platform/fuchsia/flutter/tests/ -integration/mouse_input:tests +$ENGINE_DIR/flutter/tools/gn --fuchsia --no-lto && ninja -C $ENGINE_DIR/out/fuchsia_debug_x64 flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input:tests ``` Start a Fuchsia package server @@ -41,10 +40,9 @@ cd "$FUCHSIA_DIR" fx serve ``` -Publish `touch-input-view` +Publish `mouse-input-view` ```shell -$FUCHSIA_DIR/.jiri_root/bin/fx pm publish -a -repo $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files -f $ENGINE_DIR/out/ -fuchsia_debug_x64/gen/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/mouse-input-view/mouse-input-view.far +$FUCHSIA_DIR/.jiri_root/bin/fx pm publish -a -repo $FUCHSIA_DIR/$(cat $FUCHSIA_DIR/.fx-build-dir)/amber-files -f $ENGINE_DIR/out/fuchsia_debug_x64/gen/flutter/shell/platform/fuchsia/flutter/tests/integration/mouse-input/mouse-input-view/mouse-input-view/mouse-input-view.far ``` Launch Fuchsia emulator in a graphical environment diff --git a/tools/fuchsia/devshell/run_integration_test.sh b/tools/fuchsia/devshell/run_integration_test.sh index 7b31a3a9f45af..e8fad8eb0c7b2 100755 --- a/tools/fuchsia/devshell/run_integration_test.sh +++ b/tools/fuchsia/devshell/run_integration_test.sh @@ -62,6 +62,9 @@ case $test_name in touch-input) test_packages=("touch-input-test-0.far" "touch-input-view.far" "embedding-flutter-view.far") ;; + mouse-input) + test_packages=("mouse-input-test-0.far" "mouse-input-view.far") + ;; *) engine-error "Unknown test name $test_name. You may need to add it to $0" exit 1