Changeset 85347 in webkit
- Timestamp:
- Apr 29, 2011 12:17:36 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r85344 r85347 1 2011-04-28 Ojan Vafai <ojan@chromium.org> 2 3 Reviewed by Tony Chang. 4 5 fix pretty_patch_available and wdiff_available 6 https://bugs.webkit.org/show_bug.cgi?id=59761 7 8 These methods rely on the check_* method being called first. 9 This would only happen when we actually tried to compute a diff, 10 but computing the diff happens on a different process. 11 12 Also fix setting _wdiff_avialable to True by default. 13 14 * Scripts/webkitpy/layout_tests/port/base.py: 15 * Scripts/webkitpy/layout_tests/port/chromium_linux.py: 16 * Scripts/webkitpy/layout_tests/port/chromium_linux_unittest.py: 17 1 18 2011-04-29 Ojan Vafai <ojan@chromium.org> 2 19 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py
r84544 r85347 128 128 # 2008-August/505753.html 129 129 # http://bugs.python.org/issue3210 130 self._wdiff_available = True130 self._wdiff_available = None 131 131 132 132 # FIXME: prettypatch.py knows this path, why is it copied here? … … 142 142 143 143 def wdiff_available(self): 144 return bool(self._wdiff_available) 144 if self._wdiff_available is None: 145 self._wdiff_available = self.check_wdiff(logging=False) 146 return self._wdiff_available 145 147 146 148 def pretty_patch_available(self): 147 return bool(self._pretty_patch_available) 149 if self._pretty_patch_available is None: 150 self._pretty_patch_available = self.check_pretty_patch(logging=False) 151 return self._pretty_patch_available 148 152 149 153 def default_child_processes(self): … … 186 190 def check_pretty_patch(self, logging=True): 187 191 """Checks whether we can use the PrettyPatch ruby script.""" 188 # check if Ruby is installed189 192 try: 190 193 result = self._executive.run_command(['ruby', '--version']) … … 200 203 _log.error("Unable to find %s; can't generate pretty patches." % self._pretty_patch_path) 201 204 _log.error('') 205 return False 206 207 return True 208 209 def check_wdiff(self, logging=True): 210 if not self._path_to_wdiff(): 211 # Don't need to log here since this is the port choosing not to use wdiff. 212 return False 213 214 try: 215 result = self._executive.run_command([self._path_to_wdiff(), '--help']) 216 except OSError: 217 if logging: 218 _log.error("wdiff is not installed.") 202 219 return False 203 220 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_linux.py
r83346 r85347 108 108 else: 109 109 result = self._check_lighttpd_install() and result 110 result = self. _check_wdiff_install() and result110 result = self.check_wdiff() and result 111 111 112 112 if not result: … … 160 160 return result 161 161 162 def _check_wdiff_install(self):162 def check_wdiff(self, logging=True): 163 163 result = self._check_file_exists(self._path_to_wdiff(), 'wdiff') 164 if not result :164 if not result and logging: 165 165 _log.error(' Please install using: "sudo apt-get install ' 166 166 'wdiff"') -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py
r82752 r85347 93 93 def check_build(self, needs_http): 94 94 result = chromium.ChromiumPort.check_build(self, needs_http) 95 result = self. _check_wdiff_install() and result95 result = self.check_wdiff() and result 96 96 if not result: 97 97 _log.error('For complete Mac build requirements, please see:') … … 99 99 _log.error(' http://code.google.com/p/chromium/wiki/' 100 100 'MacBuildInstructions') 101 101 102 return result 102 103 … … 126 127 'Source', 'WebKit', 'chromium', 'xcodebuild', *comps) 127 128 128 def _check_wdiff_install(self):129 def check_wdiff(self, logging=True): 129 130 try: 130 131 # We're ignoring the return and always returning True 131 132 self._executive.run_command([self._path_to_wdiff()], error_handler=Executive.ignore_error) 132 133 except OSError: 133 _log.warning('wdiff not found. Install using MacPorts or some ' 134 'other means') 134 if logging: 135 _log.warning('wdiff not found. Install using MacPorts or some ' 136 'other means') 135 137 return True 136 138 -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py
r82752 r85347 41 41 return chromium_mac.ChromiumMacPort 42 42 43 def test_check_wdiff _install(self):43 def test_check_wdiff(self): 44 44 port = chromium_mac.ChromiumMacPort() 45 46 # Currently is always true, just logs if missing. 47 self.assertTrue(port._check_wdiff_install()) 45 self.assertTrue(port.check_wdiff()) 48 46 49 47 def assert_name(self, port_name, os_version_string, expected): -
trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py
r84128 r85347 128 128 pass 129 129 130 def test_check_build(self): 131 # Override this test since ChromiumPort doesn't implement _path_to_driver(). 132 pass 133 134 def test_check_wdiff(self): 135 # Override this test since ChromiumPort doesn't implement _path_to_driver(). 136 pass 137 130 138 class TestMacPort(chromium_mac.ChromiumMacPort): 131 139 def __init__(self, options): -
trunk/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py
r84544 r85347 67 67 self.make_port().release_http_lock() 68 68 69 def test_check_build(self):70 port = self.make_port()71 self.assertTrue(port.check_build(True))72 73 69 def test_check_sys_deps(self): 74 70 port = self.make_port() -
trunk/Tools/Scripts/webkitpy/layout_tests/port/port_testcase.py
r84207 r85347 139 139 self.assertTrue(port.diff_image('foo', '', None)) 140 140 141 def test_check_build(self): 142 port = self.make_port() 143 if not port: 144 return 145 port.check_build(needs_http=True) 146 147 def test_check_wdiff(self): 148 port = self.make_port() 149 if not port: 150 return 151 port.check_wdiff() 141 152 142 153 def disabled_test_websocket_server(self):
Note: See TracChangeset
for help on using the changeset viewer.