Commit 0101944b authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot

Update references to "webkitpy".

It was moved to third_party/blink/tools, and renamed to "blinkpy".

TBR=timvolodine@chromium.org

Bug: 829697
Change-Id: Ie220adc5ce14025112e360657c3954027ae46ebe
Reviewed-on: https://chromium-review.googlesource.com/1032350Reviewed-by: default avatarTim Volodine <timvolodine@chromium.org>
Reviewed-by: default avatarKent Tamura <tkent@chromium.org>
Reviewed-by: default avatarBruce Dawson <brucedawson@chromium.org>
Reviewed-by: default avatarQuinten Yearsley <qyearsley@chromium.org>
Reviewed-by: default avatarDirk Pranke <dpranke@chromium.org>
Commit-Queue: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555195}
parent 9004311d
...@@ -520,7 +520,7 @@ ...@@ -520,7 +520,7 @@
}, },
'blink_w3ctests': { 'blink_w3ctests': {
'filepath': 'third_party/WebKit/LayoutTests/external/' \ 'filepath': 'third_party/WebKit/LayoutTests/external/' \
'|third_party/WebKit/Tools/Scripts/webkitpy/w3c/' '|third_party/blink/tools/blinkpy/w3c/'
}, },
'blink_webp': { 'blink_webp': {
'filepath': 'third_party/blink/renderer/platform/image-decoders/webp' \ 'filepath': 'third_party/blink/renderer/platform/image-decoders/webp' \
......
...@@ -61,7 +61,7 @@ public class WebViewLayoutTest { ...@@ -61,7 +61,7 @@ public class WebViewLayoutTest {
// stable interfaces can dissapear and reappear later. To select the file to compare // stable interfaces can dissapear and reappear later. To select the file to compare
// against a fallback approach is used. The order in the List below is important due // against a fallback approach is used. The order in the List below is important due
// to how blink performs baseline optimizations. For more details see // to how blink performs baseline optimizations. For more details see
// third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baseline_optimizer.py. // third_party/blink/tools/blinkpy/common/checkout/baseline_optimizer.py.
private static final List<String> BLINK_STABLE_FALLBACKS = Arrays.asList( private static final List<String> BLINK_STABLE_FALLBACKS = Arrays.asList(
EXTERNAL_PREFIX + BASE_BLINK_TEST_PATH + "virtual/stable/" + GLOBAL_LISTING_FILE, EXTERNAL_PREFIX + BASE_BLINK_TEST_PATH + "virtual/stable/" + GLOBAL_LISTING_FILE,
EXTERNAL_PREFIX + BASE_BLINK_TEST_PATH + "platform/linux/virtual/stable/" EXTERNAL_PREFIX + BASE_BLINK_TEST_PATH + "platform/linux/virtual/stable/"
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# #
# Most of this file was ported over from Blink's # Most of this file was ported over from Blink's
# Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py # tools/blinkpy/web_tests/layout_package/json_results_generator.py
# Tools/Scripts/webkitpy/common/net/file_uploader.py # tools/blinkpy/common/net/file_uploader.py
# #
import json import json
......
...@@ -432,7 +432,7 @@ def CopyIfChanged(src, target_dir): ...@@ -432,7 +432,7 @@ def CopyIfChanged(src, target_dir):
# Taken and modified from: # Taken and modified from:
# third_party\WebKit\Tools\Scripts\webkitpy\layout_tests\port\factory.py # third_party\blink\tools\blinkpy\web_tests\port\factory.py
def _read_configuration_from_gn(build_dir): def _read_configuration_from_gn(build_dir):
"""Return the configuration to used based on args.gn, if possible.""" """Return the configuration to used based on args.gn, if possible."""
path = os.path.join(build_dir, 'args.gn') path = os.path.join(build_dir, 'args.gn')
......
...@@ -19,8 +19,8 @@ with how to use it. See the ...@@ -19,8 +19,8 @@ with how to use it. See the
There are two parts to actually extending framework to test a piece of software. There are two parts to actually extending framework to test a piece of software.
The first part is extending certain files in: The first part is extending certain files in:
[/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/](/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/) [/third_party/blink/tools/blinkpy/web_tests/](/third_party/blink/tools/blinkpy/web_tests/)
The code in `webkitpy/layout_tests` is the layout test framework itself The code in `blinkpy/web_tests` is the layout test framework itself
The second part is creating a driver (program) to actually communicate the The second part is creating a driver (program) to actually communicate the
layout test framework. This part is significantly more tricky and dependent on layout test framework. This part is significantly more tricky and dependent on
......
...@@ -45,7 +45,7 @@ falling back to newer versions. Besides, Android falls back to Linux, which then ...@@ -45,7 +45,7 @@ falling back to newer versions. Besides, Android falls back to Linux, which then
falls back to Windows. Eventually, all platforms fall back to the root directory falls back to Windows. Eventually, all platforms fall back to the root directory
(i.e. the generic baselines that live alongside tests). The rules are configured (i.e. the generic baselines that live alongside tests). The rules are configured
by `FALLBACK_PATHS` in each Port class in by `FALLBACK_PATHS` in each Port class in
[`//src/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port`](../../third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port). [`//src/third_party/blink/tools/blinkpy/web_tests/port`](../../third_party/blink/tools/blinkpy/web_tests/port).
All platforms can be organized into a tree based on their fallback relations (we All platforms can be organized into a tree based on their fallback relations (we
are not considering virtual test suites yet). See the lower half (the are not considering virtual test suites yet). See the lower half (the
...@@ -94,7 +94,7 @@ hacking `blinkpy`, you can stop here. ...@@ -94,7 +94,7 @@ hacking `blinkpy`, you can stop here.
We can remove a baseline if it is the same as its fallback. An extreme example We can remove a baseline if it is the same as its fallback. An extreme example
is that if all platforms have the same result, we can just have a single generic is that if all platforms have the same result, we can just have a single generic
baseline. Here is the algorithm used by baseline. Here is the algorithm used by
[`blink_tool.py optimize-baselines`](../../third_party/WebKit/Tools/Scripts/webkitpy/common/checkout/baseline_optimizer.py) [`blink_tool.py optimize-baselines`](../../third_party/blink/tools/blinkpy/common/checkout/baseline_optimizer.py)
to optimize the duplication away. to optimize the duplication away.
Notice from the previous section that the virtual and non-virtual parts are two Notice from the previous section that the virtual and non-virtual parts are two
......
...@@ -209,7 +209,7 @@ The syntax of a line is roughly: ...@@ -209,7 +209,7 @@ The syntax of a line is roughly:
`Android`, `Release`, `Debug`. `Android`, `Release`, `Debug`.
* Some modifiers are meta keywords, e.g. `Win` represents both `Win7` and * Some modifiers are meta keywords, e.g. `Win` represents both `Win7` and
`Win10`. See the `CONFIGURATION_SPECIFIER_MACROS` dictionary in `Win10`. See the `CONFIGURATION_SPECIFIER_MACROS` dictionary in
[third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py](../../third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py) [third_party/blink/tools/blinkpy/web_tests/port/base.py](../../third_party/blink/tools/blinkpy/web_tests/port/base.py)
for the meta keywords and which modifiers they represent. for the meta keywords and which modifiers they represent.
* Expectations can be one or more of `Crash`, `Failure`, `Pass`, `Rebaseline`, * Expectations can be one or more of `Crash`, `Failure`, `Pass`, `Rebaseline`,
`Slow`, `Skip`, `Timeout`, `WontFix`, `Missing`, `NeedsManualRebaseline`. `Slow`, `Skip`, `Timeout`, `WontFix`, `Missing`, `NeedsManualRebaseline`.
......
...@@ -114,7 +114,7 @@ def temporary_file(): ...@@ -114,7 +114,7 @@ def temporary_file():
def parse_common_test_results(json_results, test_separator='/'): def parse_common_test_results(json_results, test_separator='/'):
def convert_trie_to_flat_paths(trie, prefix=None): def convert_trie_to_flat_paths(trie, prefix=None):
# Also see webkitpy.layout_tests.layout_package.json_results_generator # Also see blinkpy.web_tests.layout_package.json_results_generator
result = {} result = {}
for name, data in trie.iteritems(): for name, data in trie.iteritems():
if prefix: if prefix:
......
# Please do not remove this file. It is needed by webkitpy/w3c/directory_owners_extractor.py # Please do not remove this file. It is needed by blinkpy/w3c/directory_owners_extractor.py
# TEAM: ecosystem-infra@chromium.org # TEAM: ecosystem-infra@chromium.org
# COMPONENT: Blink>Infra>Ecosystem # COMPONENT: Blink>Infra>Ecosystem
......
...@@ -445,7 +445,7 @@ class PathParser { ...@@ -445,7 +445,7 @@ class PathParser {
this.dir = this.dir || ""; this.dir = this.dir || "";
[, this.raw_basename, this.raw_extension] = this.file.match(/(.+)\.(.+)/); [, this.raw_basename, this.raw_extension] = this.file.match(/(.+)\.(.+)/);
// WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py output_filename() // blink/tools/blinkpy/web_tests/port/base.py output_filename()
let index = this.raw_extension.indexOf("?"); let index = this.raw_extension.indexOf("?");
if (index > -1) { if (index > -1) {
let query_string = this.raw_extension.slice(index + 1); let query_string = this.raw_extension.slice(index + 1);
......
# This suite runs the tests in fullscreen with additional flags. # This suite runs the tests in fullscreen with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in rootscroller with additional flags. # This suite runs the tests in rootscroller with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in url-bar with additional flags. # This suite runs the tests in url-bar with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/fast/canvas/color-space with --enable-color-correct-rendering. # This suite runs the tests in LayoutTests/fast/canvas/color-space with --enable-color-correct-rendering.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/fast/canvas/ with --enable-accelerated-2d-canvas. # This suite runs the tests in LayoutTests/fast/canvas/ with --enable-accelerated-2d-canvas.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/paint/high-contrast-mode # This suite runs the tests in LayoutTests/paint/high-contrast-mode
# with --blink-settings="highContrastMode=3,highContrastImagePolicy=0" # with --blink-settings="highContrastMode=3,highContrastImagePolicy=0"
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/paint/high-contrast-mode # This suite runs the tests in LayoutTests/paint/high-contrast-mode
# with --blink-settings="highContrastMode=3,highContrastImagePolicy=1" # with --blink-settings="highContrastMode=3,highContrastImagePolicy=1"
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/paint/high-contrast-mode # This suite runs the tests in LayoutTests/paint/high-contrast-mode
# with --blink-settings="highContrastMode=3,highContrastImagePolicy=2" # with --blink-settings="highContrastMode=3,highContrastImagePolicy=2"
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in platform/linux/fast/text/subpixel with --enable-webkit-text-subpixel-positioning # This suite runs the tests in platform/linux/fast/text/subpixel with --enable-webkit-text-subpixel-positioning
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in platform/linux/fast/text/subpixel with additional flags. # This suite runs the tests in platform/linux/fast/text/subpixel with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in fast/text with additional flags. # This suite runs the tests in fast/text with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/compositing/overflow/ with # This suite runs the tests in LayoutTests/compositing/overflow/ with
# --enable-accelerated-overflow-scroll. # --enable-accelerated-overflow-scroll.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/scrollbars/ with --enable-accelerated-overflow-scroll. # This suite runs the tests in LayoutTests/scrollbars/ with --enable-accelerated-overflow-scroll.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/print_testharness with --enable-print-browser. # This suite runs the tests in LayoutTests/print_testharness with --enable-print-browser.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs some of the animations tests with additional flags. # This suite runs some of the animations tests with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in fast/css3-css3-text-decoration/stable with additional flags. # This suite runs the tests in fast/css3-css3-text-decoration/stable with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/media/stable with --stable-release-mode, with which # This suite runs the tests in LayoutTests/media/stable with --stable-release-mode, with which
# we run tests with only stable feature (no experiments). # we run tests with only stable feature (no experiments).
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in media/stable with additional flags. # This suite runs the tests in media/stable with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the web-animations-api/eased-keyframes.html with additional flags. # This suite runs the web-animations-api/eased-keyframes.html with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/webexposed/ with additional flags. # This suite runs the tests in LayoutTests/webexposed/ with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in fast/css/invalidation with additional flags. # This suite runs the tests in fast/css/invalidation with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/animations/ with additional flags. # This suite runs the tests in LayoutTests/animations/ with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/compositing/visibility/ with # This suite runs the tests in LayoutTests/compositing/visibility/ with
# --enable-threaded-compositing. # --enable-threaded-compositing.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/compositing/webgl/ with --enable-threaded-compositing. # This suite runs the tests in LayoutTests/compositing/webgl/ with --enable-threaded-compositing.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in virtual/threaded/fast/idleToBlob with --enable-threaded-compositing. # This suite runs the tests in virtual/threaded/fast/idleToBlob with --enable-threaded-compositing.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# Do not remove this virtual test suites unless idle tasks can be run in layout tests or # Do not remove this virtual test suites unless idle tasks can be run in layout tests or
# the test features are no longer implemented in idle tasks. # the test features are no longer implemented in idle tasks.
# This suite runs the tests in LayoutTests/inspector/tracing with additional flags. # This suite runs the tests in LayoutTests/inspector/tracing with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in LayoutTests/printing/ with additional flags. # This suite runs the tests in LayoutTests/printing/ with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# The most critical test to run in this mode is webgl-repeated-printing, which # The most critical test to run in this mode is webgl-repeated-printing, which
# is a regression test for a printing bug seen with Google Maps. # is a regression test for a printing bug seen with Google Maps.
# This suite runs the tests in LayoutTests/transitions/ with additional flags. # This suite runs the tests in LayoutTests/transitions/ with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
# This suite runs the tests in fast/text with additional flags. # This suite runs the tests in fast/text with additional flags.
# See the virtual_test_suites() method in Tools/Scripts/webkitpy/layout_tests/port/base.py. # See the virtual_test_suites() method in tools/blinkpy/web_tests/port/base.py.
...@@ -210,7 +210,7 @@ inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$ ...@@ -210,7 +210,7 @@ inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
# x/y/z - coordinates # x/y/z - coordinates
# e - except XXXError as e: # e - except XXXError as e:
# f/fd - with open('blah') as f: # f/fd - with open('blah') as f:
# _log/Run - webkitpy functions # _log/Run - blinkpy functions
good-names=_,i,j,k,v,x,y,z,e,f,fd,_log,Run good-names=_,i,j,k,v,x,y,z,e,f,fd,_log,Run
# Bad variable names which should always be refused, separated by a comma. # Bad variable names which should always be refused, separated by a comma.
......
...@@ -27,7 +27,7 @@ after wpt/config.default.json and this configuration gets merged onto it. When ...@@ -27,7 +27,7 @@ after wpt/config.default.json and this configuration gets merged onto it. When
changing the ports (HTTP/S, WS/S), make sure to also: changing the ports (HTTP/S, WS/S), make sure to also:
- update `_get_http_host_and_ports_for_test` in - update `_get_http_host_and_ports_for_test` in
`//third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/driver.py` `//third_party/blink/tools/blinkpy/web_tests/port/driver.py`
- update bot configs (e.g. `Site Isolation Linux` bot forces OOPIFs by using - update bot configs (e.g. `Site Isolation Linux` bot forces OOPIFs by using
`--isolate-origins=http://www.web-platform.test:8001/` as specified in `--isolate-origins=http://www.web-platform.test:8001/` as specified in
`//testing/buildbot/chromium.fyi.json`). `//testing/buildbot/chromium.fyi.json`).
...@@ -35,7 +35,7 @@ changing the ports (HTTP/S, WS/S), make sure to also: ...@@ -35,7 +35,7 @@ changing the ports (HTTP/S, WS/S), make sure to also:
checkout.sh checkout.sh
=========== ===========
Running this script without arguments will remove the existing checkout Running this script without arguments will remove the existing checkout
(thirdparty/wpt/wpt) and perform a fresh one. See "Rolling in WPT" for more. (third_party/wpt/wpt) and perform a fresh one. See "Rolling in WPT" for more.
WPTWhiteList WPTWhiteList
============ ============
...@@ -110,7 +110,7 @@ the desired HEAD position. You can then call "./checkout.sh clone" which will ...@@ -110,7 +110,7 @@ the desired HEAD position. You can then call "./checkout.sh clone" which will
pull in all the code. pull in all the code.
It is also important to update the hashes in the 'Version:' fields of It is also important to update the hashes in the 'Version:' fields of
tools/blinkpy/thir_dparty/README.chromium. tools/blinkpy/third_party/README.chromium.
You can examine what's pulled in and update WPTWhiteList if some new files are You can examine what's pulled in and update WPTWhiteList if some new files are
required to run the updated version. required to run the updated version.
......
...@@ -28,7 +28,7 @@ How to update or add fonts: ...@@ -28,7 +28,7 @@ How to update or add fonts:
executing the following command: executing the following command:
$ git add ./third_party/test_fonts/test_fonts.tar.gz.sha1 $ git add ./third_party/test_fonts/test_fonts.tar.gz.sha1
7. (optional) Update FONT_FILES in 7. (optional) Update FONT_FILES in
third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/port/base.py . third_party/blink/tools/blinkpy/web_tests/port/base.py .
If you need access to the chromium-fonts bucket, contact Chrome infra.% For If you need access to the chromium-fonts bucket, contact Chrome infra.% For
details, please refer to details, please refer to
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment