Rename some blink-related build targets

* webkit_unit_tests -> blink_unittests * run_webkit_tests -> run_web_tests * webkit_layout_tests -> blink_web_tests * webkit_layout_tests_exparchive -> blink_web_tests_exparchive * webkit_python_tests -> blink_python_tests Rename testing/scripts/webkit_python_tests.py to blink_python_tests.py * webkit_lint -> blink_lint_expectations Rename testing/scripts/webkit_lint.py to blink_lint_expectations.py NOTRY=true Bug: 914213 Change-Id: I4dbb92a2593a36c5ae5ead1d38960ffdeb518010 Reviewed-on: https://chromium-review.googlesource.com/c/1379626 Commit-Queue: Kent Tamura <tkent@chromium.org> Reviewed-by: Stephen Martinis <martiniss@chromium.org> Reviewed-by: Kinuko Yasuda <kinuko@chromium.org> Reviewed-by: Nico Weber <thakis@chromium.org> Cr-Commit-Position: refs/heads/master@{#632083}
marcosholgado · Feb 14, 2019 · 2cd1482 · 2cd1482
1 parent 78f53c1
commit 2cd1482
Show file tree

Hide file tree

Showing 40 changed files with 1,361 additions and 1,283 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -171,7 +171,7 @@ group("gn_all") {
       "//net:net_perftests",
       "//third_party/angle/src/tests:angle_end2end_tests",
       "//third_party/angle/src/tests:angle_unittests",
-      "//third_party/blink/renderer/controller:webkit_unit_tests",
+      "//third_party/blink/renderer/controller:blink_unittests",
       "//third_party/blink/renderer/platform/wtf:wtf_unittests",
       "//ui/gl:gl_unittests",
       "//url/ipc:url_ipc_unittests",
@@ -920,17 +920,17 @@ if (!is_ios) {
     testonly = true
 
     deps = [
-      ":webkit_layout_tests",
+      ":blink_web_tests",
       "//third_party/blink/public:all_blink",
     ]
   }
 
-  # Layout tests runner
+  # Web tests runner
   # third_party/blink/tools/run_web_tests.py
-  group("run_webkit_tests") {
+  group("run_web_tests") {
     testonly = true
     deps = [
-      ":webkit_layout_tests",
+      ":blink_web_tests",
     ]
   }
 
@@ -960,21 +960,21 @@ if (!is_ios) {
   # The _exparchive at the end of the name indicates to the isolate recipe
   # that the isolate should be archived separately using the `exparchive`
   # command, rather than as part of the normal `batcharchive` command.
-  group("webkit_layout_tests_exparchive") {
+  group("blink_web_tests_exparchive") {
     testonly = true
     deps = [
-      ":webkit_layout_tests",
+      ":blink_web_tests",
     ]
     data_deps = [
-      ":webkit_layout_tests",
+      ":blink_web_tests",
     ]
   }
 
-  # This target contains only a small subset of the layout tests,
+  # This target contains only a small subset of the web tests,
   # and is useful for testing with the regular isolate mechanism.
-  # To run the full layout test suite you need to use
-  # :webkit_layout_tests_exparchive, above, instead.
-  generated_script_test("webkit_layout_tests") {
+  # To run the full web test suite you need to use
+  # :blink_web_tests_exparchive, above, instead.
+  generated_script_test("blink_web_tests") {
     generator_script =
         "//testing/scripts/generators/gen_run_web_tests_script.py"
     extra_args = []
@@ -1101,7 +1101,7 @@ if (!is_ios) {
     ]
   }
 
-  group("webkit_python_tests") {
+  group("blink_python_tests") {
     data = [
       "//build/android/",
       "//components/crash/content/tools/generate_breakpad_symbols.py",

diff --git a/build/android/pylib/gtest/gtest_config.py b/build/android/pylib/gtest/gtest_config.py
@@ -21,6 +21,7 @@
 STABLE_TEST_SUITES = [
     'android_webview_unittests',
     'base_unittests',
+    'blink_unittests',
     'breakpad_unittests',
     'cc_unittests',
     'components_unittests',
@@ -42,7 +43,6 @@
     'ui_base_unittests',
     'ui_touch_selection_unittests',
     'unit_tests_apk',
-    'webkit_unit_tests',
 ]
 
 # Tests fail in component=shared_library build, which is required for ASan.

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
@@ -1120,7 +1120,7 @@ config("compiler_codegen") {
           # aggregates enabling subsequent optimizations) leads to
           # invalid code generation when using the Android NDK's
           # compiler (r5-r7). This can be verified using
-          # webkit_unit_tests' WTF.Checked_int8_t test.
+          # blink_unittests' WTF.Checked_int8_t test.
           "-fno-tree-sra",
 
           # The following option is disabled to improve binary

diff --git a/content/public/test/blink_test_environment.h b/content/public/test/blink_test_environment.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_PUBLIC_TEST_BLINK_TEST_ENVIRONMENT_H_
 #define CONTENT_PUBLIC_TEST_BLINK_TEST_ENVIRONMENT_H_
 
-// This package provides functions used by webkit_unit_tests.
+// This package provides functions used by blink_unittests.
 namespace content {
 
 // Initializes Blink test environment for unit tests.

diff --git a/testing/buildbot/chromium.android.fyi.json b/testing/buildbot/chromium.android.fyi.json
@@ -1037,6 +1037,53 @@
         },
         "test": "blink_platform_unittests"
       },
+      {
+        "args": [
+          "--gs-results-bucket=chromium-result-details",
+          "--recover-devices"
+        ],
+        "merge": {
+          "args": [
+            "--bucket",
+            "chromium-result-details",
+            "--test-name",
+            "webkit_unit_tests"
+          ],
+          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
+        },
+        "name": "webkit_unit_tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "cipd_packages": [
+            {
+              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
+              "location": "bin",
+              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
+            }
+          ],
+          "dimension_sets": [
+            {
+              "device_os": "NRD91N",
+              "device_type": "bullhead",
+              "os": "Android"
+            }
+          ],
+          "expiration": 10800,
+          "hard_timeout": 960,
+          "output_links": [
+            {
+              "link": [
+                "https://luci-logdog.appspot.com/v/?s",
+                "=android%2Fswarming%2Flogcats%2F",
+                "${TASK_ID}%2F%2B%2Funified_logcats"
+              ],
+              "name": "shard #${SHARD_INDEX} logcats"
+            }
+          ],
+          "shards": 2
+        },
+        "test": "blink_unittests"
+      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",
@@ -3488,52 +3535,6 @@
         },
         "test": "vr_pixeltests"
       },
-      {
-        "args": [
-          "--gs-results-bucket=chromium-result-details",
-          "--recover-devices"
-        ],
-        "merge": {
-          "args": [
-            "--bucket",
-            "chromium-result-details",
-            "--test-name",
-            "webkit_unit_tests"
-          ],
-          "script": "//build/android/pylib/results/presentation/test_results_presentation.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "cipd_packages": [
-            {
-              "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
-              "location": "bin",
-              "revision": "git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c"
-            }
-          ],
-          "dimension_sets": [
-            {
-              "device_os": "NRD91N",
-              "device_type": "bullhead",
-              "os": "Android"
-            }
-          ],
-          "expiration": 10800,
-          "hard_timeout": 960,
-          "output_links": [
-            {
-              "link": [
-                "https://luci-logdog.appspot.com/v/?s",
-                "=android%2Fswarming%2Flogcats%2F",
-                "${TASK_ID}%2F%2B%2Funified_logcats"
-              ],
-              "name": "shard #${SHARD_INDEX} logcats"
-            }
-          ],
-          "shards": 2
-        },
-        "test": "webkit_unit_tests"
-      },
       {
         "args": [
           "--gs-results-bucket=chromium-result-details",