Commit a89e88ee authored by tkent's avatar tkent Committed by Commit bot

webkitpy: Remove WebKitFinder.path_to_script()

It can be replaced with path_from_tools_scripts().

BUG=710535

Review-Url: https://codereview.chromium.org/2849743003
Cr-Commit-Position: refs/heads/master@{#468260}
parent dfcdb145
...@@ -117,12 +117,6 @@ class WebKitFinder(object): ...@@ -117,12 +117,6 @@ class WebKitFinder(object):
def path_from_blink_source(self, *comps): def path_from_blink_source(self, *comps):
return self._filesystem.join(self._filesystem.join(self.webkit_base(), 'Source'), *comps) return self._filesystem.join(self._filesystem.join(self.webkit_base(), 'Source'), *comps)
def path_to_script(self, script_name):
"""Returns the relative path to the script from the top of the WebKit tree."""
# This is intentionally relative in order to force callers to consider what
# their current working directory is (and change to the top of the tree if necessary).
return self._filesystem.join('Tools', 'Scripts', script_name)
def path_from_tools_scripts(self, *comps): def path_from_tools_scripts(self, *comps):
return self._filesystem.join(self._filesystem.join(self.webkit_base(), 'Tools', 'Scripts'), *comps) return self._filesystem.join(self._filesystem.join(self.webkit_base(), 'Tools', 'Scripts'), *comps)
......
...@@ -877,9 +877,6 @@ class Port(object): ...@@ -877,9 +877,6 @@ class Port(object):
def path_from_chromium_base(self, *comps): def path_from_chromium_base(self, *comps):
return self._webkit_finder.path_from_chromium_base(*comps) return self._webkit_finder.path_from_chromium_base(*comps)
def path_to_script(self, script_name):
return self._webkit_finder.path_to_script(script_name)
def layout_tests_dir(self): def layout_tests_dir(self):
custom_layout_tests_dir = self.get_option('layout_tests_directory') custom_layout_tests_dir = self.get_option('layout_tests_directory')
if custom_layout_tests_dir: if custom_layout_tests_dir:
......
...@@ -404,8 +404,7 @@ class WPTExpectationsUpdater(object): ...@@ -404,8 +404,7 @@ class WPTExpectationsUpdater(object):
for test in tests_to_rebaseline: for test in tests_to_rebaseline:
_log.info(' %s', test) _log.info(' %s', test)
if tests_to_rebaseline: if tests_to_rebaseline:
webkit_patch = self.host.filesystem.join( webkit_patch = self.finder.path_from_tools_scripts('webkit-patch')
self.finder.chromium_base(), self.finder.webkit_base(), self.finder.path_to_script('webkit-patch'))
self.host.executive.run_command([ self.host.executive.run_command([
'python', 'python',
webkit_patch, webkit_patch,
......
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