Changeset 57475 in webkit


Ignore:
Timestamp:
Apr 12, 2010 11:03:12 AM (14 years ago)
Author:
eric@webkit.org
Message:

2010-04-12 Eric Seidel <eric@webkit.org>

Reviewed by Adam Barth.

new-run-webkit-tests fails with exception on systems missing ruby
https://bugs.webkit.org/show_bug.cgi?id=37441

  • Scripts/webkitpy/layout_tests/port/base.py:
    • Catch failures similar to how wdiff code path does.
    • After one failure, stop trying.
Location:
trunk/WebKitTools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r57470 r57475  
     12010-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
    1122010-04-12  Tony Chang  <tony@chromium.org>
    213
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py

    r57466 r57475  
    4747# Python bug workaround.  See Port.wdiff_text() for an explanation.
    4848_wdiff_available = True
    49 
     49_pretty_patch_available = True
    5050
    5151# FIXME: This class should merge with webkitpy.webkit_port at some point.
     
    566566
    567567    def pretty_patch_text(self, diff_path):
     568        global _pretty_patch_available
     569        if not _pretty_patch_available:
     570            return "Failed to run PrettyPatch"
    568571        pretty_patch_path = self.path_from_webkit_base("BugsSite", "PrettyPatch")
    569572        prettify_path = os.path.join(pretty_patch_path, "prettify.rb")
    570573        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
    572580
    573581    def default_configuration(self):
Note: See TracChangeset for help on using the changeset viewer.