[packages] Remove most of //topaz/packages/tests/BUILD.gn
These are now available as //topaz:tests. This CL cannot actually delete
the last target in //topaz/packages/tests/BUILD.gn because the name of
the target is known to infrastructure.
Change-Id: Iceee0691dafe99f2767130d221ace5d24da59d0a
diff --git a/BUILD.gn b/BUILD.gn
index 908e5a8..fe417f4 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -8,6 +8,7 @@
# TODO: Remove //peridot/packages:kitchen_sink once client have that
# dependency explicitly.
"//peridot/packages:kitchen_sink",
+ "//topaz:tests",
"//topaz/packages:all",
]
}
@@ -15,7 +16,76 @@
group("tests") {
testonly = true
public_deps = [
- "//topaz/packages/tests:all",
+ # TODO: This target should just aggregate the top-level directories and
+ # most of these dependencies should be in those subdirectories.
+ "//garnet/examples/ui:tile_view",
+ "//garnet/packages/tests:fidl_compatibility_test_server_cpp",
+ "//garnet/packages/tests:fidl_compatibility_test_server_go",
+ "//garnet/packages/tests:fidl_compatibility_test_server_llcpp",
+ "//garnet/packages/tests:fidl_compatibility_test_server_rust",
+ "//garnet/packages/tests:run_test_component",
+ "//garnet/packages/tests:scenic",
+ "//garnet/packages/tools:scenic",
+ "//peridot/packages/prod:integration_testing",
+ "//peridot/packages/tests:ledger",
+ "//src/fonts",
+ "//topaz/bin/crasher_dart",
+ "//topaz/bin/crasher_flutter",
+ "//topaz/bin/dart_fidl_json/test:dart_fidl_json_test($host_toolchain)",
+ "//topaz/bin/fidl_bindings_test/server:fidl_bindings_test_server",
+ "//topaz/bin/fidl_bindings_test/test:fidl_bindings_test",
+ "//topaz/bin/fidl_compatibility_test:fidl_compatibility_test_topaz",
+ "//topaz/bin/fidl_compatibility_test/dart:fidl_compatibility_test_server_dart",
+ "//topaz/bin/fidlgen_dart:fidlgen_dart_backend_ir_test($host_toolchain)",
+ "//topaz/bin/fidlgen_dart:fidlgen_dart_backend_test($host_toolchain)",
+ "//topaz/bin/flutter_screencap_test:flutter_screencap_test_app",
+ "//topaz/bin/flutter_screencap_test",
+ "//topaz/bin/ui/benchmarks/image_grid_flutter",
+ "//topaz/examples/ledger/todo_list:todo_list_test($host_toolchain)",
+ "//topaz/examples/test/flutter_widget_test($host_toolchain)",
+ "//topaz/lib/keyboard/flutter:keyboard_test($host_toolchain)",
+ "//topaz/lib/setui/common:lib_setui_common_test($host_toolchain)",
+ "//topaz/lib/setui/flutter:lib_setui_flutter_test($host_toolchain)",
+ "//topaz/lib/story_shell/examples/story_shell_test:key_listener_device_tests",
+ "//topaz/lib/tiler:tiler_unittests($host_toolchain)",
+ "//topaz/packages/examples:fidl",
+ "//topaz/packages/examples:tests",
+ "//topaz/packages/prod:web_runner",
+ "//topaz/public/dart-pkg/zircon:dart_zircon_test",
+ "//topaz/public/dart/composition_delegate:composition_delegate_tests($host_toolchain)",
+ "//topaz/public/dart/fuchsia_inspect_flutter:inspect_flutter_test($host_toolchain)",
+ "//topaz/public/dart/fuchsia_inspect_flutter/examples/torus15:torus15_flutter_test($host_toolchain)",
+ "//topaz/public/dart/fuchsia_inspect:fuchsia_inspect_package_unittests($host_toolchain)",
+ "//topaz/public/dart/fuchsia_inspect/test/integration:dart_inspect_vmo_test_writer",
+ "//topaz/public/dart/fuchsia_inspect/test/integration:dart_inspect_vmo_test",
+ "//topaz/public/dart/fuchsia_logger:fuchsia_logger_package_unittests($host_toolchain)",
+ "//topaz/public/dart/fuchsia_modular_flutter:fuchsia_modular_flutter_unittests($host_toolchain)",
+ "//topaz/public/dart/fuchsia_modular_testing:fuchsia_modular_testing_package_integration_tests",
+ "//topaz/public/dart/fuchsia_modular:fuchsia_modular_package_integration_tests",
+ "//topaz/public/dart/fuchsia_modular:fuchsia_modular_package_unittests($host_toolchain)",
+ "//topaz/public/dart/fuchsia_scenic_flutter:fuchsia_scenic_flutter_unittests($host_toolchain)",
+ "//topaz/public/dart/fuchsia_services:fuchsia_services_foo_test_server",
+ "//topaz/public/dart/fuchsia_services:fuchsia_services_package_integration_tests",
+ "//topaz/public/dart/fuchsia_services:fuchsia_services_package_unittests($host_toolchain)",
+ "//topaz/public/dart/fuchsia_vfs:fuchsia_vfs_package_unittests",
+ "//topaz/public/dart/fuchsia_webview_flutter:fuchsia_webview_flutter_target_tests",
+ "//topaz/public/dart/fuchsia_webview_flutter:fuchsia_webview_flutter_unittests($host_toolchain)",
+ "//topaz/public/dart/sledge:dart_sledge_tests($host_toolchain)",
+ "//topaz/public/dart/sledge:sledge_integration_tests",
+ "//topaz/public/dart/story_shell_labs:layout_unittests($host_toolchain)",
+ "//topaz/public/dart/widgets:dart_widget_tests($host_toolchain)",
+ "//topaz/public/dart/zircon:test_extract_zircon_constants($host_toolchain)",
+ "//topaz/public/lib/display/flutter:display_test($host_toolchain)",
+ "//topaz/runtime/chromium:chromium_prebuilts",
+ "//topaz/runtime/dart_runner/examples/goodbye_dart:goodbye_dart_test",
+ "//topaz/runtime/dart_runner/integration:dart_aot_runner_test",
+ "//topaz/runtime/dart_runner/integration:dart_jit_runner_test",
+ "//topaz/runtime/dart/utils:run_vmservice_object_tests",
+ "//topaz/runtime/flutter_runner:flutter_runner_tests",
+ "//topaz/shell/mondrian_story_shell:mondrian_story_shell_tests($host_toolchain)",
+ "//topaz/tests/fidl-changes",
+ "//topaz/tests/fidl-dangerous-identifiers",
+ "//topaz/tests/web_runner_tests",
]
}
diff --git a/packages/BUILD.gn b/packages/BUILD.gn
index 7effc0e..d5e7918 100644
--- a/packages/BUILD.gn
+++ b/packages/BUILD.gn
@@ -6,10 +6,10 @@
testonly = true
public_deps = [
"//garnet/packages/benchmarks:buildbot",
+ "//topaz:tests",
"//topaz/bin/fidlgen_dart:install(//build/toolchain:host_x64)",
"//topaz/packages/examples:all",
"//topaz/packages/prod:all",
- "//topaz/packages/tests:all",
"//topaz/public/sdk",
"//topaz/tests/benchmarks:all",
"//topaz/tools/doc_checker:tests(//build/toolchain:host_x64)",
diff --git a/packages/tests/BUILD.gn b/packages/tests/BUILD.gn
index c9039eb..23205ea 100644
--- a/packages/tests/BUILD.gn
+++ b/packages/tests/BUILD.gn
@@ -2,219 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-group("scenic") {
- testonly = true
- public_deps = [
- "//garnet/examples/ui:tile_view",
- "//garnet/packages/tests:scenic",
- "//topaz/bin/ui/benchmarks/image_grid_flutter",
- ]
-}
-
-group("dart_unittests") {
- testonly = true
- public_deps = [
- "//topaz/bin/dart_fidl_json/test:dart_fidl_json_test($host_toolchain)",
- "//topaz/examples/ledger/todo_list:todo_list_test($host_toolchain)",
- "//topaz/examples/test/flutter_widget_test($host_toolchain)",
- "//topaz/lib/keyboard/flutter:keyboard_test($host_toolchain)",
- "//topaz/lib/setui/common:lib_setui_common_test($host_toolchain)",
- "//topaz/lib/setui/flutter:lib_setui_flutter_test($host_toolchain)",
- "//topaz/lib/tiler:tiler_unittests($host_toolchain)",
- "//topaz/public/dart/composition_delegate:composition_delegate_tests($host_toolchain)",
- "//topaz/public/dart/fuchsia_inspect:fuchsia_inspect_package_unittests($host_toolchain)",
- "//topaz/public/dart/fuchsia_inspect_flutter/examples/torus15:torus15_flutter_test($host_toolchain)",
- "//topaz/public/dart/fuchsia_inspect_flutter:inspect_flutter_test($host_toolchain)",
- "//topaz/public/dart/fuchsia_logger:fuchsia_logger_package_unittests($host_toolchain)",
- "//topaz/public/dart/fuchsia_modular:fuchsia_modular_package_unittests($host_toolchain)",
- "//topaz/public/dart/fuchsia_modular_flutter:fuchsia_modular_flutter_unittests($host_toolchain)",
- "//topaz/public/dart/fuchsia_scenic_flutter:fuchsia_scenic_flutter_unittests($host_toolchain)",
- "//topaz/public/dart/fuchsia_services:fuchsia_services_package_unittests($host_toolchain)",
- "//topaz/public/dart/fuchsia_webview_flutter:fuchsia_webview_flutter_unittests($host_toolchain)",
- "//topaz/public/dart/sledge:dart_sledge_tests($host_toolchain)",
- "//topaz/public/dart/story_shell_labs:layout_unittests($host_toolchain)",
- "//topaz/public/dart/widgets:dart_widget_tests($host_toolchain)",
- "//topaz/public/lib/display/flutter:display_test($host_toolchain)",
- "//topaz/shell/mondrian_story_shell:mondrian_story_shell_tests($host_toolchain)",
- ]
-}
-
-group("bindings_tests") {
- testonly = true
- public_deps = [
- "//topaz/bin/fidl_bindings_test/server:fidl_bindings_test_server",
- "//topaz/bin/fidl_bindings_test/test:fidl_bindings_test",
- ]
-}
-
-group("dart") {
- testonly = true
- public_deps = [
- "//topaz/public/dart/zircon:test_extract_zircon_constants($host_toolchain)",
- "//topaz/runtime/dart_runner/examples/goodbye_dart:goodbye_dart_test",
- "//topaz/runtime/dart_runner/integration:dart_aot_runner_test",
- "//topaz/runtime/dart_runner/integration:dart_jit_runner_test",
- ]
-}
-
# WARNING: Known to infrastructure.
group("all") {
testonly = true
public_deps = [
- "//garnet/packages/tests:run_test_component",
- "//topaz/bin/fidlgen_dart:fidlgen_dart_backend_ir_test($host_toolchain)",
- "//topaz/bin/fidlgen_dart:fidlgen_dart_backend_test($host_toolchain)",
- "//topaz/packages/examples:tests",
- "//topaz/packages/tests:bindings_tests",
- "//topaz/packages/tests:chromium_prebuilt_tests",
- "//topaz/packages/tests:crasher_dart",
- "//topaz/packages/tests:crasher_flutter",
- "//topaz/packages/tests:dart",
- "//topaz/packages/tests:dart_target_integration_tests",
- "//topaz/packages/tests:dart_target_unittests",
- "//topaz/packages/tests:dart_unittests",
- "//topaz/packages/tests:fidl_changes",
- "//topaz/packages/tests:fidl_compatibility_test_server_dart",
- "//topaz/packages/tests:fidl_compatibility_test_topaz",
- "//topaz/packages/tests:fidl_dangerous_identifiers",
- "//topaz/packages/tests:flutter_runner_tests",
- "//topaz/packages/tests:flutter_screencap_test",
- "//topaz/packages/tests:flutter_screencap_test_app",
- "//topaz/packages/tests:key_listener_test",
- "//topaz/packages/tests:scenic",
- "//topaz/packages/tests:sledge",
- "//topaz/packages/tests:web_runner_tests",
- ]
-}
-
-group("crasher_flutter") {
- testonly = true
- public_deps = [
- "//topaz/bin/crasher_flutter",
- ]
-}
-
-group("flutter_screencap_test_app") {
- testonly = true
- public_deps = [
- "//garnet/packages/tools:scenic",
- "//topaz/bin/flutter_screencap_test:flutter_screencap_test_app",
- ]
-}
-
-group("dart_target_unittests") {
- testonly = true
- public_deps = [
- "//topaz/public/dart-pkg/zircon:dart_zircon_test",
- "//topaz/public/dart/fuchsia_modular:fuchsia_modular_package_integration_tests",
- "//topaz/public/dart/fuchsia_modular_testing:fuchsia_modular_testing_package_integration_tests",
- "//topaz/public/dart/fuchsia_services:fuchsia_services_foo_test_server",
- "//topaz/public/dart/fuchsia_services:fuchsia_services_package_integration_tests",
- "//topaz/public/dart/fuchsia_vfs:fuchsia_vfs_package_unittests",
- "//topaz/public/dart/fuchsia_webview_flutter:fuchsia_webview_flutter_target_tests",
- "//topaz/runtime/dart/utils:run_vmservice_object_tests",
- ]
-}
-
-group("fidl_compatibility_test_server_dart") {
- testonly = true
- public_deps = [
- "//topaz/bin/fidl_compatibility_test/dart:fidl_compatibility_test_server_dart",
- ]
-}
-
-group("crasher_dart") {
- testonly = true
- public_deps = [
- "//topaz/bin/crasher_dart",
- ]
-}
-
-group("fidl_compatibility_test_topaz") {
- testonly = true
- public_deps = [
- "//garnet/packages/tests:fidl_compatibility_test_server_cpp",
- "//garnet/packages/tests:fidl_compatibility_test_server_go",
- "//garnet/packages/tests:fidl_compatibility_test_server_llcpp",
- "//garnet/packages/tests:fidl_compatibility_test_server_rust",
- "//topaz/bin/fidl_compatibility_test:fidl_compatibility_test_topaz",
- "//topaz/packages/tests:fidl_compatibility_test_server_dart",
- ]
-}
-
-group("web_runner_tests") {
- testonly = true
- public_deps = [
- "//topaz/packages/prod:web_runner",
- "//topaz/tests/web_runner_tests",
- ]
-}
-
-group("key_listener_test") {
- testonly = true
- public_deps = [
- "//topaz/lib/story_shell/examples/story_shell_test:key_listener_device_tests",
- ]
-}
-
-group("flutter_screencap_test") {
- testonly = true
- public_deps = [
- "//peridot/packages/prod:integration_testing",
- "//topaz/bin/flutter_screencap_test",
- "//topaz/packages/tests:flutter_screencap_test_app",
- ]
-}
-
-group("dart_target_integration_tests") {
- testonly = true
- public_deps = [
- "//topaz/packages/examples:fidl",
- "//topaz/public/dart/fuchsia_inspect/test/integration:dart_inspect_vmo_test",
- "//topaz/public/dart/fuchsia_inspect/test/integration:dart_inspect_vmo_test_writer",
- ]
-}
-
-group("fidl_changes") {
- testonly = true
- public_deps = [
- "//topaz/tests/fidl-changes",
- ]
-}
-
-group("fidl_dangerous_identifiers") {
- testonly = true
- public_deps = [
- "//topaz/tests/fidl-dangerous-identifiers",
- ]
-}
-
-group("sledge") {
- testonly = true
- public_deps = [
- "//peridot/packages/tests:ledger",
- "//topaz/public/dart/sledge:sledge_integration_tests",
- ]
-}
-
-group("flutter_runner_tests") {
- testonly = true
- public_deps = [
- "//src/fonts",
- "//topaz/runtime/flutter_runner:flutter_runner_tests",
- ]
-}
-
-group("dart_fidl_benchmarks") {
- testonly = true
- public_deps = [
- "//topaz/tests/dart_fidl_benchmarks",
- ]
-}
-
-group("chromium_prebuilt_tests") {
- testonly = true
- public_deps = [
- "//topaz/runtime/chromium:chromium_prebuilts",
+ "//topaz:tests",
]
}
diff --git a/public/dart/fuchsia_inspect/README.md b/public/dart/fuchsia_inspect/README.md
index 9b4b109..a0b6c1e 100644
--- a/public/dart/fuchsia_inspect/README.md
+++ b/public/dart/fuchsia_inspect/README.md
@@ -20,7 +20,7 @@
Unit tests for Inspect are available in the `fuchsia_inspect_package_unittests`
package. This includes tests from the `test/inspect` and `test/vmo` directories.
-To run these tests, include `--with //topaz/packages/tests:all` in the `fx set`
+To run these tests, include `--with //topaz:tests` in the `fx set`
invocation and run the following command:
```
diff --git a/tests/dart_fidl_benchmarks/README.md b/tests/dart_fidl_benchmarks/README.md
index ad7ebd7..34cb50c 100644
--- a/tests/dart_fidl_benchmarks/README.md
+++ b/tests/dart_fidl_benchmarks/README.md
@@ -7,8 +7,8 @@
- string encoding and decoding, both ASCII and Unicode
You can include this in your build by including the target:
-`//topaz/packages/tests:dart_fidl_benchmarks`. If you use `fx` that means
-passing `--with //topaz/packages/tests:dart_fidl_benchmarks` to `fx set`.
+`//topaz/tests/dart_fidl_benchmarks`. If you use `fx` that means
+passing `--with //topaz/tests/dart_fidl_benchmarks` to `fx set`.
You can run the benchmarks by invoking:
```
