Changeset 57500 in webkit
- Timestamp:
- Apr 12, 2010 9:38:20 PM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r57499 r57500 1 2010-04-12 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 Make new-run-webkit-test PrettyPatch failure reporting more awesome 6 https://bugs.webkit.org/show_bug.cgi?id=37487 7 8 I also fixed an Executive/executive typo. 9 10 * Scripts/webkitpy/layout_tests/port/base.py: 11 1 12 2010-04-12 Eric Seidel <eric@webkit.org> 2 13 -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
r57497 r57500 43 43 import websocket_server 44 44 45 from webkitpy.common.system.executive import Executive 45 from webkitpy.common.system import logutils 46 from webkitpy.common.system.executive import Executive, ScriptError 47 48 49 _log = logutils.get_logger(__file__) 50 46 51 47 52 # Python bug workaround. See Port.wdiff_text() for an explanation. … … 565 570 return result 566 571 572 _pretty_patch_error_html = "Failed to run PrettyPatch, see error console." 573 567 574 def pretty_patch_text(self, diff_path): 568 575 global _pretty_patch_available 569 576 if not _pretty_patch_available: 570 return "Failed to run PrettyPatch"577 return self._pretty_patch_error_html 571 578 pretty_patch_path = self.path_from_webkit_base("BugsSite", "PrettyPatch") 572 579 prettify_path = os.path.join(pretty_patch_path, "prettify.rb") … … 575 582 return self._executive.run_command(command) 576 583 except OSError, e: 577 # If the y system is missing ruby just log the error,and stop trying.584 # If the system is missing ruby log the error and stop trying. 578 585 _pretty_patch_available = False 579 return "Failed to run PrettyPatch: %s" % e 580 except Executive.ScriptError, e: 581 # If they system is missing ruby just log the error, and stop trying. 586 _log.error("Failed to run PrettyPatch (%s): %s" % (command, e)) 587 return self._pretty_patch_error_html 588 except ScriptError, e: 589 # If ruby failed to run for some reason, log the command output and stop trying. 582 590 _pretty_patch_available = False 583 return "Failed to run PrettyPatch: %s" % e 591 _log.error("Failed to run PrettyPatch (%s):\n%s" % (command, e.message_with_output())) 592 return self._pretty_patch_error_html 584 593 585 594 def default_configuration(self):
Note: See TracChangeset
for help on using the changeset viewer.