Title: [123941] trunk/Tools
Revision
123941
Author
[email protected]
Date
2012-07-27 17:34:51 -0700 (Fri, 27 Jul 2012)

Log Message

"webkit-patch rebaseline <test>" fails with exit_code 1
https://bugs.webkit.org/show_bug.cgi?id=91560

Reviewed by Adam Barth.

webkit-patch rebaseline-json crashes in an svn checkout if it
tries to add files and there are no files to add; arguably
svn.add() should be robust against this, but rebaseline-json
shouldn't be calling it, either. This patch fixes the latter and
adds better debugging info to garden-o-matic so we can see what
caused the crash.

* Scripts/webkitpy/tool/commands/rebaseline.py:
(AbstractParallelRebaselineCommand._rebaseline):
* Scripts/webkitpy/tool/servers/gardeningserver.py:
(GardeningHTTPRequestHandler.rebaselineall):
(GardeningHTTPRequestHandler.rebaselineall.error_handler):
(GardeningHTTPRequestHandler):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (123940 => 123941)


--- trunk/Tools/ChangeLog	2012-07-28 00:32:15 UTC (rev 123940)
+++ trunk/Tools/ChangeLog	2012-07-28 00:34:51 UTC (rev 123941)
@@ -1,3 +1,24 @@
+2012-07-27  Dirk Pranke  <[email protected]>
+
+        "webkit-patch rebaseline <test>" fails with exit_code 1
+        https://bugs.webkit.org/show_bug.cgi?id=91560
+
+        Reviewed by Adam Barth.
+
+        webkit-patch rebaseline-json crashes in an svn checkout if it
+        tries to add files and there are no files to add; arguably
+        svn.add() should be robust against this, but rebaseline-json
+        shouldn't be calling it, either. This patch fixes the latter and
+        adds better debugging info to garden-o-matic so we can see what
+        caused the crash.
+
+        * Scripts/webkitpy/tool/commands/rebaseline.py:
+        (AbstractParallelRebaselineCommand._rebaseline):
+        * Scripts/webkitpy/tool/servers/gardeningserver.py:
+        (GardeningHTTPRequestHandler.rebaselineall):
+        (GardeningHTTPRequestHandler.rebaselineall.error_handler):
+        (GardeningHTTPRequestHandler):
+
 2012-07-27  Brady Eidson  <[email protected]>
 
         Plugins should not be allowed to override standard properties/attributes in non-standard worlds

Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py (123940 => 123941)


--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py	2012-07-28 00:32:15 UTC (rev 123940)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py	2012-07-28 00:34:51 UTC (rev 123941)
@@ -302,7 +302,8 @@
         command_results = self._tool.executive.run_in_parallel(commands)
 
         files_to_add = self._files_to_add(command_results)
-        self._tool.scm().add_list(list(files_to_add))
+        if files_to_add:
+            self._tool.scm().add_list(list(files_to_add))
 
         if options.optimize:
             self._optimize_baselines(test_list)

Modified: trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py (123940 => 123941)


--- trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py	2012-07-28 00:32:15 UTC (rev 123940)
+++ trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py	2012-07-28 00:34:51 UTC (rev 123941)
@@ -142,5 +142,11 @@
 
     def rebaselineall(self):
         command = ['rebaseline-json']
-        self.server.tool.executive.run_command([self.server.tool.path()] + command, input=self.read_entity_body(), cwd=self.server.tool.scm().checkout_root)
+        json_input = self.read_entity_body()
+        _log.debug("rebaselining using '%s'" % json_input)
+
+        def error_handler(script_error):
+            _log.error("error from rebaseline-json: %s, input='%s', output='%s'" % (str(script_error), json_input, script_error.output))
+
+        self.server.tool.executive.run_command([self.server.tool.path()] + command, input=json_input, cwd=self.server.tool.scm().checkout_root, return_stderr=True, error_handler=error_handler)
         self._serve_text('success')
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to