Commit c65312e5 authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot

move_blink_source.py: Update the list of layout tests with mojom.

Also, fix new path. All *.mojom.js files in third_party/WebKit/public/,
and new directory should be third_party/blink/public/.

Bug: 578345
Change-Id: Icb5e06c1094b2fdc5f8c057bffb530e208e5ae57
Reviewed-on: https://chromium-review.googlesource.com/990855
Commit-Queue: Kent Tamura <tkent@chromium.org>
Reviewed-by: default avatarQuinten Yearsley <qyearsley@chromium.org>
Cr-Commit-Position: refs/heads/master@{#547945}
parent 5e249953
...@@ -68,8 +68,19 @@ class FileType(object): ...@@ -68,8 +68,19 @@ class FileType(object):
return FileType.NONE return FileType.NONE
return FileType.BUILD return FileType.BUILD
if basename.endswith('.html') and re.search( if basename.endswith('.html') and re.search(
r'third_party/WebKit/LayoutTests/(geolocation-api|installedapp|' + r'third_party/WebKit/LayoutTests/('
r'media/mediasession|payments|presentation|webshare)', slash_dir): r'fast/dom/shadow|'
r'fast/forms/color|'
r'geolocation-api|'
r'http/tests/budget|'
r'http/tests/credentialmanager|'
r'http/tests/security/powerfulFeatureRestrictions|'
r'installedapp|'
r'media/mediasession|'
r'payments|'
r'presentation|'
r'reporting-observer|'
r'webshare)', slash_dir):
return FileType.LAYOUT_TESTS_WITH_MOJOM return FileType.LAYOUT_TESTS_WITH_MOJOM
return FileType.NONE return FileType.NONE
...@@ -451,7 +462,8 @@ Bug: 768828 ...@@ -451,7 +462,8 @@ Bug: 768828
return self._update_basename(content) return self._update_basename(content)
def _update_layout_tests(self, content): def _update_layout_tests(self, content):
return content.replace('file:///gen/third_party/WebKit/', 'file:///gen/third_party/blink/renderer/') return content.replace('file:///gen/third_party/WebKit/public/',
'file:///gen/third_party/blink/public/')
def _update_basename(self, content): def _update_basename(self, content):
return self._basename_re.sub(lambda match: self._basename_map[match.group(1)], content) return self._basename_re.sub(lambda match: self._basename_map[match.group(1)], content)
......
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