Revert "Reland "Add test directory -> monorail component metadata to …

…test invocations."" This reverts commit 548c753. Reason for revert: https://ci.chromium.org/ui/p/chromium/builders/ci/Win7%20(32)%20Tests/70306/overview Original change's description: > Reland "Add test directory -> monorail component metadata to test invocations." > > This reverts commit a2927e3. > > Change-Id: I40558e50f44a497a492829e561fc7c0358619d2f > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2779735 > Reviewed-by: Chan Li <chanli@chromium.org> > Commit-Queue: Dirk Pranke <dpranke@google.com> > Cr-Commit-Position: refs/heads/master@{#865433} Change-Id: I5a647ef7442edacfdafc34670b3e8810b43315cc No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2780518 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Reviewed-by: Yutaka Hirano <yhirano@chromium.org> Commit-Queue: Yutaka Hirano <yhirano@chromium.org> Owners-Override: Yutaka Hirano <yhirano@chromium.org> Cr-Commit-Position: refs/heads/master@{#865467}
Denger-Network · Mar 23, 2021 · a60a11f · a60a11f
1 parent 03b1417
commit a60a11f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 108 deletions.
diff --git a/.gitignore b/.gitignore
@@ -280,7 +280,6 @@ vs-chromium-project.txt
 /sql/sql_unittests_run.xml
 /sync/sync.xml
 /testing/libfuzzer/fuzzer_corpus_for_bots/
-/testing/location_tags.json
 /testing/rts/
 /testserver.log
 # See third_party/.gitignore for entries covering src/third_party.

diff --git a/DEPS b/DEPS
@@ -4371,17 +4371,6 @@ hooks = [
     ],
   },
 
-  {
-    'name': 'Generate component metadata for tests',
-    'pattern': '.',
-    'action': [
-      'vpython',
-      'src/testing/generate_location_tags.py',
-      '--out',
-      'src/testing/location_tags.json',
-    ],
-  },
-
   # Download and initialize "vpython" VirtualEnv environment packages.
   {
     'name': 'vpython_common',

diff --git a/build/config/fuchsia/generate_runner_scripts.gni b/build/config/fuchsia/generate_runner_scripts.gni
@@ -91,10 +91,6 @@ template("fuchsia_package_runner") {
       data = []
     }
 
-    if (defined(invoker.data)) {
-      data += invoker.data
-    }
-
     wrapper_script = generated_run_pkg_script_path
 
     data_deps = [

diff --git a/testing/generate_location_tags.py b/testing/generate_location_tags.py
diff --git a/testing/test.gni b/testing/test.gni
@@ -78,13 +78,11 @@ template("test") {
       executable(_exec_target) {
         # Configs will always be defined since we set_defaults in BUILDCONFIG.gn.
         configs = []
-        forward_variables_from(
-            invoker,
-            "*",
-            TESTONLY_AND_VISIBILITY + _wrapper_script_vars + [
-                  "data_deps",
-                  "extra_dist_files",
-                ])
+        data_deps = []
+        forward_variables_from(invoker,
+                               "*",
+                               TESTONLY_AND_VISIBILITY + _wrapper_script_vars +
+                                   [ "extra_dist_files" ])
 
         # Thanks to the set_defaults() for test(), configs are initialized with
         # the default shared_library configs rather than executable configs.
@@ -94,16 +92,6 @@ template("test") {
         ]
         configs += [ "//build/config:executable_config" ]
 
-        if (defined(invoker.data_deps)) {
-          data_deps = invoker.data_deps
-        } else {
-          data_deps = []
-        }
-        if (!defined(data)) {
-          data = []
-        }
-        data += [ "//testing/location_tags.json" ]
-
         # Don't output to the root or else conflict with the group() below.
         output_name = rebase_path(_exec_output, root_out_dir)
       }
@@ -237,13 +225,6 @@ template("test") {
           ":$_library_target",
         ]
       }
-
-      if (defined(invoker.data_deps)) {
-        data_deps = invoker.data_deps
-      } else {
-        data_deps = []
-      }
-      data = [ "//testing/location_tags.json" ]
     }
   } else if (is_fuchsia) {
     assert(!defined(invoker.use_xvfb) || !invoker.use_xvfb)
@@ -291,7 +272,6 @@ template("test") {
       package = ":$_pkg_target"
       package_name_override = _output_name
 
-      data = [ "//testing/location_tags.json" ]
       data_deps = [ "//testing/buildbot/filters:fuchsia_filters" ]
     }
 
@@ -323,6 +303,7 @@ template("test") {
       forward_variables_from(invoker,
                              [
                                "data",
+                               "data_deps",
                                "deps",
                                "executable_args",
                                "retries",
@@ -340,11 +321,6 @@ template("test") {
       ]
 
       wrapper_output_name = "${_wrapper_output_name}"
-
-      if (!defined(data)) {
-        data = []
-      }
-      data += [ "//testing/location_tags.json" ]
     }
 
     _resources_bundle_data = target_name + "_resources_bundle_data"
@@ -415,7 +391,6 @@ template("test") {
       generated_script = "$root_build_dir/bin/run_" + invoker.target_name
       test_exe = invoker.target_name
       runtime_deps_file = _runtime_deps_file
-      data = [ "//testing/location_tags.json" ]
     }
 
     executable(target_name) {
@@ -465,7 +440,6 @@ template("test") {
         executable = "//testing/test_env.py"
         data += [ "//testing/test_env.py" ]
       }
-      data += [ "//testing/location_tags.json" ]
 
       executable_args = [
         "@WrappedPath(../../build/lacros/test_runner.py)",
@@ -541,7 +515,6 @@ template("test") {
         executable = "//testing/test_env.py"
         data += [ "//testing/test_env.py" ]
       }
-      data += [ "//testing/location_tags.json" ]
 
       executable_args = [
         "@WrappedPath(./${_executable})",
@@ -645,8 +618,6 @@ template("script_test") {
     if (defined(invoker.data)) {
       data += invoker.data
     }
-    data += [ "//testing/location_tags.json" ]
-
     data_deps = []
     if (defined(invoker.data_deps)) {
       data_deps += invoker.data_deps