commit f54a7a40aaedb5d273df5534d605c405d746e650
author Kevin Cho <chok@google.com> Fri Aug 09 18:13:04 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Fri Aug 09 18:13:04 2019 +0000
tree e49ff0dd87dbc75d307381b96a5d098c6995d8a0
parent e37464a27a8fed1a9a01173981c98b6b62dbf47c

[chromium-prebuilt] Defining tests based on vendor test manifest.

Change-Id: Ice4d08924ae4903fd817aa83f48670fe99bc2f8c

packages/tests/BUILD.gn

diff --git a/packages/tests/BUILD.gn b/packages/tests/BUILD.gn
index 3fef87c..97bd4a7 100644
--- a/packages/tests/BUILD.gn
+++ b/packages/tests/BUILD.gn
@@ -214,13 +214,6 @@
 group("chromium_prebuilt_tests") {
   testonly = true
   public_deps = [
-    "//topaz/runtime/chromium:base_unittests",
-    "//topaz/runtime/chromium:blink_common_unittests",
-    "//topaz/runtime/chromium:cast_runner_integration_tests",
-    "//topaz/runtime/chromium:ipc_tests",
-    "//topaz/runtime/chromium:media_unittests",
-    "//topaz/runtime/chromium:mojo_unittests",
-    "//topaz/runtime/chromium:skia_unittests",
-    "//topaz/runtime/chromium:web_runner_integration_tests",
+    "//topaz/runtime/chromium:chromium_prebuilts",
   ]
 }

runtime/chromium/BUILD.gn

diff --git a/runtime/chromium/BUILD.gn b/runtime/chromium/BUILD.gn
index a0fdb73..5187ba2 100644
--- a/runtime/chromium/BUILD.gn
+++ b/runtime/chromium/BUILD.gn
@@ -3,7 +3,7 @@
 # found in the LICENSE file.
 
 import("//build/packages/prebuilt_package.gni")
-import("//build/packages/prebuilt_test_package.gni")
+import("//build/packages/prebuilt_test_manifest.gni")
 
 prebuilt_package("chromium") {
   archive = "//topaz/third_party/chromium/arch/$target_cpu/chromium.far"
@@ -14,8 +14,6 @@
 }
 
 # Prebuilt FAR tests
-# TODO(chok): Use prebuilt_test_manifest() template when fxr/293408 is submitted
-
 test_env = [
   {
     dimensions = {
@@ -25,26 +23,8 @@
   },
 ]
 
-test_names = [
-  "base_unittests",
-  "cast_runner_integration_tests",
-  "web_runner_integration_tests",
-  "ipc_tests",
-  "media_unittests",
-  "mojo_unittests",
-  "skia_unittests",
-  "blink_common_unittests",
-]
-
-foreach(test_name, test_names) {
-  prebuilt_test_package(test_name) {
-    archive = "//prebuilt/third_party/chromium_tests/arch/x64/${test_name}.far"
-    package = test_name
-    tests = [
-      {
-        component_name = test_name
-        environments = test_env
-      },
-    ]
-  }
+prebuilt_test_manifest("chromium_prebuilts") {
+  archive_dir = "//prebuilt/third_party/chromium_tests/arch/x64"
+  package_name_prefix = "chromium_prebuilts"
+  environments = test_env
 }