Rename webkit_layout_tests to blink_web_tests

Rename test webkit_layout_tests to blink_web_tests, and update related tools and docs. Bug: 914213 Change-Id: I13031dee55409da093f8450db834c3c4595f579e Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2040050 Commit-Queue: John Chen <johnchen@chromium.org> Reviewed-by: John Budorick <jbudorick@chromium.org> Reviewed-by: Robert Ma <robertma@chromium.org> Cr-Commit-Position: refs/heads/master@{#746262}
marcosholgado · Mar 3, 2020 · aab16fc · aab16fc
1 parent 4944fbd
commit aab16fc
Show file tree

Hide file tree

Showing 29 changed files with 1,079 additions and 1,079 deletions.
diff --git a/docs/parsing_test_results.md b/docs/parsing_test_results.md
@@ -60,10 +60,10 @@ Most builds follow a similar pattern. The key *steps* are listed here.
   suites are affected by the patch.
 * **compile (with patch)** Builds test suites and associated artifacts.
 * **isolate tests** Archives test suite binaries and artifacts.
-* **test_pre_run.[trigger] webkit_layout_tests (with patch)** Triggers a test
+* **test_pre_run.[trigger] blink_web_tests (with patch)** Triggers a test
   suite on swarming [remote execution framework] -- in this case,
-  webkit_layout_tests.
-* **webkit_layout_tests (with patch)** Collects the results from swarming for a
+  blink_web_tests.
+* **blink_web_tests (with patch)** Collects the results from swarming for a
   test suite.
 
 If all test suites pass, then the *build* is marked as a success and no further
@@ -74,9 +74,9 @@ test failure is due to the CL or due to a problem with tip of tree.
 * **bot_update [without patch]** Deapplies the CL patch.
 * **compile [without patch]** Compiles test suites.
 * **isolate tests (2)** Archives test suite binaries and artifacts.
-* **test_pre_run.[trigger] webkit_layout_tests (without patch)** Triggers test
+* **test_pre_run.[trigger] blink_web_tests (without patch)** Triggers test
   suite on swarming. Only failing tests are rerun.
-* **webkit_layout_tests (without patch)** Collects results from swarming.
+* **blink_web_tests (without patch)** Collects results from swarming.
 
 **Important safety notice**. When test suites are run with the patch applied,
 each test is run up to N times -- any success will mark the test as a success.

diff --git a/testing/buildbot/chromium.clang.json b/testing/buildbot/chromium.clang.json
@@ -22022,6 +22022,25 @@
         },
         "test_target": "//:blink_python_tests"
       },
+      {
+        "args": [
+          "--num-retries=3"
+        ],
+        "isolate_name": "blink_web_tests",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "blink_web_tests",
+        "results_handler": "layout tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 12
+        },
+        "test_target": "//:blink_web_tests"
+      },
       {
         "args": [
           "--test-type=integration"
@@ -22187,25 +22206,6 @@
           "can_use_on_swarming_builders": true
         },
         "test_target": "//ui/views:views_perftests"
-      },
-      {
-        "args": [
-          "--num-retries=3"
-        ],
-        "isolate_name": "blink_web_tests",
-        "merge": {
-          "args": [
-            "--verbose"
-          ],
-          "script": "//third_party/blink/tools/merge_web_test_results.py"
-        },
-        "name": "webkit_layout_tests",
-        "results_handler": "layout tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 12
-        },
-        "test_target": "//:blink_web_tests"
       }
     ]
   },
@@ -24204,6 +24204,25 @@
         },
         "test_target": "//:blink_python_tests"
       },
+      {
+        "args": [
+          "--num-retries=3"
+        ],
+        "isolate_name": "blink_web_tests",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "blink_web_tests",
+        "results_handler": "layout tests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "shards": 12
+        },
+        "test_target": "//:blink_web_tests"
+      },
       {
         "args": [
           "--test-type=integration"
@@ -24369,25 +24388,6 @@
           "can_use_on_swarming_builders": true
         },
         "test_target": "//ui/views:views_perftests"
-      },
-      {
-        "args": [
-          "--num-retries=3"
-        ],
-        "isolate_name": "blink_web_tests",
-        "merge": {
-          "args": [
-            "--verbose"
-          ],
-          "script": "//third_party/blink/tools/merge_web_test_results.py"
-        },
-        "name": "webkit_layout_tests",
-        "results_handler": "layout tests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "shards": 12
-        },
-        "test_target": "//:blink_web_tests"
       }
     ]
   },

diff --git a/testing/buildbot/chromium.devtools-frontend.json b/testing/buildbot/chromium.devtools-frontend.json
@@ -27,18 +27,16 @@
     "isolated_scripts": [
       {
         "args": [
-          "--num-retries=3",
-          "--layout-tests-directory=../../third_party/devtools-frontend/src/test/webtests/",
-          "http/tests/devtools"
+          "--num-retries=3"
         ],
-        "isolate_name": "devtools_web_tests",
+        "isolate_name": "blink_web_tests",
         "merge": {
           "args": [
             "--verbose"
           ],
           "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
-        "name": "webkit_layout_from_devtools",
+        "name": "blink_web_tests",
         "results_handler": "layout tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -47,22 +45,24 @@
               "os": "Ubuntu-16.04"
             }
           ],
-          "shards": 4
+          "shards": 12
         },
-        "test_target": "//:devtools_web_tests"
+        "test_target": "//:blink_web_tests"
       },
       {
         "args": [
-          "--num-retries=3"
+          "--num-retries=3",
+          "--layout-tests-directory=../../third_party/devtools-frontend/src/test/webtests/",
+          "http/tests/devtools"
         ],
-        "isolate_name": "blink_web_tests",
+        "isolate_name": "devtools_web_tests",
         "merge": {
           "args": [
             "--verbose"
           ],
           "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
-        "name": "webkit_layout_tests",
+        "name": "webkit_layout_from_devtools",
         "results_handler": "layout tests",
         "swarming": {
           "can_use_on_swarming_builders": true,
@@ -71,9 +71,9 @@
               "os": "Ubuntu-16.04"
             }
           ],
-          "shards": 12
+          "shards": 4
         },
-        "test_target": "//:blink_web_tests"
+        "test_target": "//:devtools_web_tests"
       }
     ]
   }