Changeset 57475 in webkit
- Timestamp:
- Apr 12, 2010 11:03:12 AM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r57470 r57475 1 2010-04-12 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 new-run-webkit-tests fails with exception on systems missing ruby 6 https://bugs.webkit.org/show_bug.cgi?id=37441 7 8 * Scripts/webkitpy/layout_tests/port/base.py: 9 - Catch failures similar to how wdiff code path does. 10 - After one failure, stop trying. 11 1 12 2010-04-12 Tony Chang <tony@chromium.org> 2 13 -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
r57466 r57475 47 47 # Python bug workaround. See Port.wdiff_text() for an explanation. 48 48 _wdiff_available = True 49 49 _pretty_patch_available = True 50 50 51 51 # FIXME: This class should merge with webkitpy.webkit_port at some point. … … 566 566 567 567 def pretty_patch_text(self, diff_path): 568 global _pretty_patch_available 569 if not _pretty_patch_available: 570 return "Failed to run PrettyPatch" 568 571 pretty_patch_path = self.path_from_webkit_base("BugsSite", "PrettyPatch") 569 572 prettify_path = os.path.join(pretty_patch_path, "prettify.rb") 570 573 command = ["ruby", "-I", pretty_patch_path, prettify_path, diff_path] 571 return self._executive.run_command(command) 574 try: 575 return self._executive.run_command(command) 576 except OSError, e: 577 # If they system is missing ruby just log the error, and stop trying. 578 _pretty_patch_available = False 579 return "Failed to run PrettyPatch: %s" % e 572 580 573 581 def default_configuration(self):
Note: See TracChangeset
for help on using the changeset viewer.