Move merge-layout-test-results to //third_party/blink/tools.

New name is merge_web_test_results.py.

Note that we decided to rename LayoutTests to web_tests.
https://groups.google.com/a/chromium.org/forum/#!msg/blink-dev/KKNbuzj-3HY/H8FWgtKrBgAJ


Bug: 829697
Change-Id: I24bf833ba794316734d04495e7c1f30f9dad5090
Reviewed-on: https://chromium-review.googlesource.com/1025618Reviewed-by: Quinten Yearsley <qyearsley@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#553355}

testing/buildbot/chromium.fyi.json

@@ -2301,7 +2301,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -2819,7 +2819,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -4740,7 +4740,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "site_per_process_webkit_layout_tests",
         "results_handler": "layout tests",
@@ -4821,7 +4821,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -5345,7 +5345,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -7675,7 +7675,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -7705,7 +7705,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -7735,7 +7735,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -8467,7 +8467,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -8639,7 +8639,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,

testing/buildbot/chromium.linux.json

@@ -1333,7 +1333,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "site_per_process_webkit_layout_tests",
         "results_handler": "layout tests",
@@ -1394,7 +1394,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,

testing/buildbot/chromium.mac.json

@@ -464,7 +464,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -938,7 +938,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -1412,7 +1412,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -1900,7 +1900,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,

testing/buildbot/chromium.webkit.json

@@ -12,7 +12,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -41,7 +41,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -74,7 +74,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -107,7 +107,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -140,7 +140,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -168,7 +168,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -194,7 +194,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -223,7 +223,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -250,7 +250,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -291,7 +291,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -319,7 +319,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,

testing/buildbot/chromium.win.json

@@ -1786,7 +1786,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,
@@ -3025,7 +3025,7 @@
           "args": [
             "--verbose"
           ],
-          "script": "//third_party/WebKit/Tools/Scripts/merge-layout-test-results"
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
         "name": "webkit_layout_tests",
         "only_retry_failed_tests": true,

testing/buildbot/test_suites.pyl

@@ -556,7 +556,7 @@
         'args': [
           '--verbose',
         ],
-        'script': '//third_party/WebKit/Tools/Scripts/merge-layout-test-results',
+        'script': '//third_party/blink/tools/merge_web_test_results.py',
       },
       'only_retry_failed_tests': True,
       'results_handler': 'layout tests',
@@ -838,7 +838,7 @@
         'args': [
           '--verbose',
         ],
-        'script': '//third_party/WebKit/Tools/Scripts/merge-layout-test-results',
+        'script': '//third_party/blink/tools/merge_web_test_results.py',
       },
       'only_retry_failed_tests': True,
       'results_handler': 'layout tests',
@@ -1113,7 +1113,7 @@
         'args': [
           '--verbose',
         ],
-        'script': '//third_party/WebKit/Tools/Scripts/merge-layout-test-results',
+        'script': '//third_party/blink/tools/merge_web_test_results.py',
       },
       'only_retry_failed_tests': True,
       'results_handler': 'layout tests',
@@ -1297,7 +1297,7 @@
         'args': [
           '--verbose',
         ],
-        'script': '//third_party/WebKit/Tools/Scripts/merge-layout-test-results',
+        'script': '//third_party/blink/tools/merge_web_test_results.py',
       },
       'results_handler': 'layout tests',
       'swarming': {
@@ -1794,7 +1794,7 @@
         'args': [
           '--verbose'
         ],
-        'script': '//third_party/WebKit/Tools/Scripts/merge-layout-test-results',
+        'script': '//third_party/blink/tools/merge_web_test_results.py',
       },
       'only_retry_failed_tests': True,
       'results_handler': 'layout tests',

third_party/blink/tools/blinkpy/web_tests/merge_results.py

@@ -789,7 +789,7 @@ directory. The script will be given the arguments plus
         args.positional = []
 
     # Allow skipping the --input-directories bit, for example,
-    #   merge-layout-test-results -o outputdir shard0 shard1 shard2
+    #   merge_web_test_results.py -o outputdir shard0 shard1 shard2
     if args.positional and not args.input_directories:
         args.input_directories = args.positional
 

third_party/WebKit/Tools/Scripts/merge-layout-test-results → third_party/blink/tools/merge_web_test_results.py

@@ -6,7 +6,6 @@
 
 import sys
 
-from webkitpy.common import add_blinkpy  # pylint: disable=unused-import
 from blinkpy.web_tests.merge_results import main