| Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_manifest.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_manifest.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_manifest.py
|
| index ff48742db4876915015eef94c1a4124093a77a0b..ec6009ce592b6a3f9c56c53d5bc5c8677f8c4813 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_manifest.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_manifest.py
|
| @@ -91,8 +91,8 @@ class WPTManifest(object):
|
| def ensure_manifest(host):
|
| """Checks whether the manifest exists, and then generates it if necessary."""
|
| finder = WebKitFinder(host.filesystem)
|
| - manifest_path = finder.path_from_webkit_base('LayoutTests', 'external', 'wpt', 'MANIFEST.json')
|
| - base_manifest_path = finder.path_from_webkit_base('LayoutTests', 'external', 'WPT_BASE_MANIFEST.json')
|
| + manifest_path = finder.path_from_layout_tests('external', 'wpt', 'MANIFEST.json')
|
| + base_manifest_path = finder.path_from_layout_tests('external', 'WPT_BASE_MANIFEST.json')
|
|
|
| if not host.filesystem.exists(base_manifest_path):
|
| _log.error('Manifest base not found at "%s".', base_manifest_path)
|
| @@ -102,7 +102,7 @@ class WPTManifest(object):
|
| _log.debug('Manifest not found, copying from base "%s".', base_manifest_path)
|
| host.filesystem.copyfile(base_manifest_path, manifest_path)
|
|
|
| - wpt_path = manifest_path = finder.path_from_webkit_base('LayoutTests', 'external', 'wpt')
|
| + wpt_path = manifest_path = finder.path_from_layout_tests('external', 'wpt')
|
| WPTManifest.generate_manifest(host, wpt_path)
|
|
|
| @staticmethod
|
| @@ -110,7 +110,7 @@ class WPTManifest(object):
|
| """Generates MANIFEST.json on the specified directory."""
|
| executive = host.executive
|
| finder = WebKitFinder(host.filesystem)
|
| - manifest_exec_path = finder.path_from_webkit_base('Tools', 'Scripts', 'webkitpy', 'thirdparty', 'wpt', 'wpt', 'manifest')
|
| + manifest_exec_path = finder.path_from_tools_scripts('webkitpy', 'thirdparty', 'wpt', 'wpt', 'manifest')
|
|
|
| cmd = ['python', manifest_exec_path, '--work', '--tests-root', dest_path]
|
| _log.debug('Running command: %s', ' '.join(cmd))
|
|
|