Changeset 57964 in webkit
- Timestamp:
- Apr 21, 2010 3:57:15 AM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r57963 r57964 1 2010-04-21 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> 2 3 Reviewed by Eric Seidel. 4 5 new-run-webkit-tests: try to detect alternate apache path 6 https://bugs.webkit.org/show_bug.cgi?id=37587 7 8 _check_port_build() also needs to return true in the 9 base implementation to not fail the check_build step. 10 11 * Scripts/webkitpy/layout_tests/port/webkit.py: 12 1 13 2010-04-21 Yi Shen <yi.4.shen@nokia.com> 2 14 -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
r57858 r57964 55 55 base.Port.__init__(self, port_name, options) 56 56 self._cached_build_root = None 57 self._cached_apache_path = None 57 58 58 59 # FIXME: disable pixel tests until they are run by default on the … … 103 104 def _check_port_build(self): 104 105 # Ports can override this method to do additional checks. 105 pass106 return True 106 107 107 108 def check_image_diff(self, override_step=None, logging=True): … … 324 325 325 326 def _path_to_apache(self): 326 return '/usr/sbin/httpd' 327 if not self._cached_apache_path: 328 # The Apache binary path can vary depending on OS and distribution 329 # See http://wiki.apache.org/httpd/DistrosDefaultLayout 330 for path in ["/usr/sbin/httpd", "/usr/sbin/apache2"]: 331 if os.path.exists(path): 332 self._cached_apache_path = path 333 break 334 335 if not self._cached_apache_path: 336 _log.error("Could not find apache. Not installed or unknown path.") 337 338 return self._cached_apache_path 327 339 328 340
Note: See TracChangeset
for help on using the changeset viewer.