[fuchsia_test_package] Add package_deps to fuchsia_test_package targets.

These tests depend on other fuchsia packages that are not included as
subpackages but are needed at runtime and thus need to be forwarded
through the package_deps to the test_spec. Also add debug_agent by
default because most target tests use it for getting backtraces.

Bug: 407117303
Fixed: 406571868
Change-Id: I0b230f9f54a1483425d8ada58af8b7164afcc9c1
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1254636
Reviewed-by: Aaron Wood <[email protected]>
Reviewed-by: Dale Sather <[email protected]>
Fuchsia-Auto-Submit: Ina Huh <[email protected]>
Commit-Queue: Auto-Submit <auto-submit-builder@fuchsia-internal-service-accts.iam.gserviceaccount.com>
Reviewed-by: Christopher Johnson <[email protected]>

Author: ihuh0

build/components/fuchsia_package.gni

@@ -391,6 +391,9 @@ template("fuchsia_package") {
                              ])
       public_deps = [ ":$_package_build_target" ]
       deps = main_target_deps
+      if (defined(invoker.package_deps)) {
+        deps += invoker.package_deps
+      }
       if (_is_driver_package) {
         metadata = {
           # Allow exclusion of driver packages by assembly

build/components/fuchsia_test_package.gni

@@ -97,6 +97,13 @@ _log_severity_allowed_val = [
 #     details.
 #     Type: list of targets
 #
+#   package_deps (optional)
+#     A list of `fuchsia_package` targets that are not subpackages but needed
+#     by the test at runtime. This will get forwarded to the test_spec. See
+#     //build/testing/test_spec.gni for more details. If using this instead of
+#     `subpackages`, please add a comment explaining why.
+#     Type: list of targets
+#
 #   is_bootfs (optional)
 #     ONLY to be used by |fuchsia_bootfs_test_package| to indicate a bootfs based package.
 #
@@ -321,6 +328,7 @@ template("fuchsia_test_package") {
                                "deps",
                                "disable_elf_binaries_checks",
                                "metadata",
+                               "package_deps",
                                "visibility",
                              ])
       package_name = package_name

build/testing/test_spec.gni

@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/board.gni")
+import("//build/config/fuchsia/target_api_level.gni")
 import("//build/group_with_inputs.gni")
 import("//build/testing/environments.gni")
 import("//build/testing/platforms.gni")
@@ -410,6 +411,7 @@ template("test_spec") {
   }
 
   target_name_deps = []
+  target_name_data_deps = []
 
   # Rely on metadata reachable through deps to determine any runtime
   # dependencies of the test; record them to a file.
@@ -440,15 +442,28 @@ template("test_spec") {
   # Some tests depend on other packages so get the paths to the
   # package_manifests of those package dependencies to attach to
   # the test_spec of the test so we know what blobs it depends on.
+  # Most target tests use debug_agent to get backtraces so include
+  # it by default. A target test can be defined by a test that has a
+  # package_manifests field.
   pkg_manifest_deps_file = ""
-  if (defined(invoker.package_deps) && invoker.package_deps != []) {
+  package_deps = []
+  if (defined(invoker.package_deps)) {
+    package_deps = invoker.package_deps
+  }
+  if (package_deps != [] || defined(invoker.package_label)) {
+    if (target_cpu != "riscv64" &&
+        current_build_target_api_level == "PLATFORM") {
+      # TODO(https://fxbug.dev/42074048): Remove conditional once
+      # debug_agent works for riscv64.
+      package_deps += [ "//src/developer/debug/debug_agent" ]
+    }
     pkg_manifest_deps_file = "$target_gen_dir/${target_name}.pkg_manifests.json"
     pkg_manifest_deps_target_name = "${target_name}_pkg_manifest_deps"
 
     _manifest_entries = []
     _manifest_inputs = []
     _package_deps_with_toolchain = []
-    foreach(package_dep, invoker.package_deps) {
+    foreach(package_dep, package_deps) {
       _package_deps_with_toolchain +=
           [ get_label_info(package_dep, "label_no_toolchain") +
             "(${target_toolchain})" ]
@@ -474,7 +489,7 @@ template("test_spec") {
       deps = _package_deps_with_toolchain
       inputs = _manifest_inputs
     }
-    target_name_deps += [
+    target_name_data_deps += [
       ":${pkg_manifest_deps_inputs_name}",
       ":${pkg_manifest_deps_target_name}",
     ]
@@ -616,6 +631,7 @@ template("test_spec") {
       tests = [ test_spec ]
     }
     deps = target_name_deps
+    data_deps = target_name_data_deps
     if (defined(invoker.isolated) && invoker.isolated &&
         # Tests that use product bundles, primarily boot tests, must necessarily
         # run in isolated mode, so they need not be explicitly included in the

src/graphics/tests/vkvalidation/BUILD.gn

@@ -60,6 +60,8 @@ fuchsia_test_component("vkvalidation_external_cmp") {
 
 fuchsia_test_package("vkvalidation-external-pkg") {
   package_name = "vkvalidation-external"
+  package_deps =
+      [ "//src/lib/vulkan/vulkan-validation-pkg:validation-server-pkg" ]
   test_components = [ ":vkvalidation_external_cmp" ]
   test_specs = {
     environments = magma_libvulkan_hardware_envs

src/lib/testing/sharding/tests/integration/BUILD.gn

@@ -46,5 +46,5 @@ fuchsia_test_package("sharding-integration-tests") {
   # from universe via the subpackaged test manager.
   # TODO(http://b/301507292): Stop requiring use of the system resolver in
   # test manager tests.
-  deps = [ "//src/lib/testing/sharding/tests/example_sharded_test:example-sharded-test" ]
+  package_deps = [ "//src/lib/testing/sharding/tests/example_sharded_test:example-sharded-test" ]
 }

src/sys/test_manager/tests/nonhermetic_packaged_tests/BUILD.gn

@@ -26,6 +26,7 @@ fuchsia_test_component("echo_test_specific_package") {
 
 fuchsia_test_package("nonhermetic_packaged_test") {
   test_components = [ ":echo_test_specific_package" ]
+  package_deps = [ ":echo_server_for_test" ]
 }
 
 fuchsia_package("echo_server_for_test") {

src/sys/test_runners/elf/tests/BUILD.gn

@@ -31,6 +31,9 @@ fuchsia_test_component("elf_test_runner_integration_test") {
 fuchsia_test_package("elf-test-runner-integration-test") {
   test_components = [ ":elf_test_runner_integration_test" ]
   subpackages = [ "//src/sys/test_manager:pkg" ]
+
+  # TODO(https://fxbug.dev/412436921): Use subpackages instead of package_deps.
+  package_deps = [ "../test_data:elf-test-runner-example-tests" ]
 }
 
 group("tests") {

src/sys/test_runners/gotests/tests/BUILD.gn

@@ -32,6 +32,9 @@ fuchsia_test_component("go_runner_integration_test") {
 fuchsia_test_package("go-runner-integration-test") {
   test_components = [ ":go_runner_integration_test" ]
   subpackages = [ "//src/sys/test_manager:pkg" ]
+
+  # TODO(https://fxbug.dev/412436921): Use subpackages instead of package_deps.
+  package_deps = [ "../test_data:go-test-runner-example" ]
 }
 
 group("tests") {

src/sys/test_runners/gtest/tests/BUILD.gn

@@ -66,6 +66,9 @@ fuchsia_test_package("gtest-runner-integration-test") {
   ]
   subpackages = [ "//src/sys/test_manager:pkg" ]
 
+  # TODO(https://fxbug.dev/412436921): Use subpackages instead of package_deps.
+  package_deps = [ "../test_data:gtest-runner-example-tests" ]
+
   # https://fxbug.dev/42154358: This stress test fails on coverage bot.
   if (is_coverage) {
     test_components -= [ ":gtest_runner_stress_test" ]

src/sys/test_runners/gunit/tests/BUILD.gn

@@ -37,6 +37,9 @@ fuchsia_test_component("gunit_runner_integration_test") {
 fuchsia_test_package("gunit-runner-integration-test") {
   test_components = [ ":gunit_runner_integration_test" ]
   subpackages = [ "//src/sys/test_manager:pkg" ]
+
+  # TODO(https://fxbug.dev/412436921): Use subpackages instead of package_deps.
+  package_deps = [ ":gunit-runner-example-tests" ]
 }
 
 fuchsia_component("empty_test_component") {