Skip to content

Commit

Permalink
Begin importing WPT runner codebase into Chromium.
Browse files Browse the repository at this point in the history
This code is used to run WPT tests in the public upstream repository,
and is being integrated into Chromium CI.

This change begins the automatic import of this code, as well as adding
several lint and presubmit check exclusions.

Bug: 937369
Change-Id: Ie9409e671b0c06a10bb509a53946687c0b7a3f65
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1495372
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Robert Ma <robertma@chromium.org>
Commit-Queue: Luke Z <lpz@chromium.org>
Cr-Commit-Position: refs/heads/master@{#637373}
  • Loading branch information
LukeZielinski authored and Commit Bot committed Mar 4, 2019
1 parent d76980d commit 9bc14ac
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 6 deletions.
2 changes: 1 addition & 1 deletion PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -1378,7 +1378,7 @@ def _CheckForVersionControlConflictsInFile(input_api, f):
pattern = input_api.re.compile('^(?:<<<<<<<|>>>>>>>) |^=======$')
errors = []
for line_num, line in f.ChangedContents():
if f.LocalPath().endswith('.md'):
if f.LocalPath().endswith(('.md', '.rst', '.txt')):
# First-level headers in markdown look a lot like version control
# conflict markers. http://daringfireball.net/projects/markdown/basics
continue
Expand Down
3 changes: 2 additions & 1 deletion third_party/blink/PRESUBMIT.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@


_EXCLUDED_PATHS = (
# This directory is created and updated via a script.
# These directories are created and updated via a script.
r'^third_party[\\\/]blink[\\\/]tools[\\\/]blinkpy[\\\/]third_party[\\\/]wpt[\\\/]wpt[\\\/].*',
r'^third_party[\\\/]blink[\\\/]web_tests[\\\/]external[\\\/]wpt[\\\/]tools[\\\/].*',
)


Expand Down
26 changes: 22 additions & 4 deletions third_party/blink/web_tests/W3CImportExpectations
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,28 @@ external/wpt/html/rendering/replaced-elements/svg-embedded-sizing/svg-in-object-

# The wpt tools (including manifest and wptserve) are checked in to
# blinkpy/third_party/wpt so that we can manually update them and keep
# a stable pinned version.
external/wpt/tools [ Skip ]
external/wpt/wpt [ Skip ]
external/wpt/wpt.py [ Skip ]
# a stable pinned version. This manual import supports the legacy layout
# test runner (run_web_tests).
# The tools directory is also automatically imported alongside the tests
# in order to run wptrunner in the Chromium CQ. The following exceptions
# are for directories we don't need.
external/wpt/tools/ci/tests [ Skip ]
external/wpt/tools/gitignore/tests [ Skip ]
external/wpt/tools/lint/tests [ Skip ]
external/wpt/tools/manifest/tests [ Skip ]
external/wpt/tools/pywebsocket/example [ Skip ]
external/wpt/tools/pywebsocket/tests [ Skip ]
external/wpt/tools/scripts [ Skip ]
external/wpt/tools/wpt/tests [ Skip ]
external/wpt/tools/wptrunner/docs [ Skip ]
external/wpt/tools/wptrunner/test [ Skip ]
external/wpt/tools/wptrunner/wptrunner/browsers/sauce_setup [ Skip ]
external/wpt/tools/wptrunner/wptrunner/tests [ Skip ]
external/wpt/tools/wptserve/docs [ Skip ]
external/wpt/tools/wptserve/tests [ Skip ]
# These two files contain comments that look like version control markers
external/wpt/tools/third_party/hyper/hyper/packages/rfc3986/__init__.py [ Skip ]
external/wpt/tools/third_party/pytest/src/_pytest/_argcomplete.py [ Skip ]

# The outputs of these tests contain random values generated by token()
# in common/utils.js. These could be imported if the results for
Expand Down
1 change: 1 addition & 0 deletions tools/checkperms/checkperms.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@
'native_client_sdk/src/build_tools/sdk_tools/third_party/fancy_urllib/'
'__init__.py',
'out/',
'third_party/blink/web_tests/external/wpt/tools/third_party/',
# TODO(maruel): Fix these.
'third_party/devscripts/licensecheck.pl.vanilla',
'third_party/libxml/linux/xml2-config',
Expand Down

0 comments on commit 9bc14ac

Please sign in to comment.