| OLD | NEW |
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 """A utility class for interacting with the Chromium git tree | 5 """A utility class for interacting with the Chromium git tree |
| 6 for use cases relating to the Web Platform Tests. | 6 for use cases relating to the Web Platform Tests. |
| 7 """ | 7 """ |
| 8 | 8 |
| 9 CHROMIUM_WPT_DIR = 'third_party/WebKit/LayoutTests/imported/wpt/' | 9 CHROMIUM_WPT_DIR = 'third_party/WebKit/LayoutTests/imported/wpt/' |
| 10 | 10 |
| 11 from webkitpy.common.memoized import memoized | 11 from webkitpy.common.memoized import memoized |
| 12 from webkitpy.common.webkit_finder import WebKitFinder | 12 from webkitpy.common.blink_finder import BlinkFinder |
| 13 | 13 |
| 14 | 14 |
| 15 class ChromiumWPT(object): | 15 class ChromiumWPT(object): |
| 16 | 16 |
| 17 def __init__(self, host): | 17 def __init__(self, host): |
| 18 """ | 18 """ |
| 19 Args: | 19 Args: |
| 20 host: A Host object. | 20 host: A Host object. |
| 21 """ | 21 """ |
| 22 self.host = host | 22 self.host = host |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 def format_patch(self, chromium_commit): | 68 def format_patch(self, chromium_commit): |
| 69 """Makes a patch with just changes in files in the WPT for a given commi
t.""" | 69 """Makes a patch with just changes in files in the WPT for a given commi
t.""" |
| 70 # TODO(jeffcarp): do not include expectations files | 70 # TODO(jeffcarp): do not include expectations files |
| 71 return self.host.executive.run_command([ | 71 return self.host.executive.run_command([ |
| 72 'git', 'format-patch', '-1', '--stdout', | 72 'git', 'format-patch', '-1', '--stdout', |
| 73 chromium_commit, self.absolute_chromium_wpt_dir() | 73 chromium_commit, self.absolute_chromium_wpt_dir() |
| 74 ]) | 74 ]) |
| 75 | 75 |
| 76 @memoized | 76 @memoized |
| 77 def absolute_chromium_wpt_dir(self): | 77 def absolute_chromium_wpt_dir(self): |
| 78 finder = WebKitFinder(self.host.filesystem) | 78 finder = BlinkFinder(self.host.filesystem) |
| 79 return finder.path_from_webkit_base('LayoutTests', 'imported', 'wpt') | 79 return finder.path_from_blink_base('LayoutTests', 'imported', 'wpt') |
| OLD | NEW |