Changeset 58076 in webkit
- Timestamp:
- Apr 22, 2010 2:20:28 AM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r58074 r58076 1 2010-04-22 Eric Seidel <eric@webkit.org> 2 3 Reviewed by Adam Barth. 4 5 new-run-webkit-tests --verbose shows ever-increasing #EOF lines 6 https://bugs.webkit.org/show_bug.cgi?id=37794 7 8 * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py: 9 - Fix the log message to explain that this is stderr output, not test output. 10 * Scripts/webkitpy/layout_tests/port/webkit.py: 11 - Be sure to reset the server_process.error after reading (seems like the wrong 12 place to do this, but at least this fixes the bug and dpranke and I can talk 13 about better designs later). 14 - Also remove the #EOF from the stderr output before returning it. 15 1 16 2010-04-22 Eric Seidel <eric@webkit.org> 2 17 -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py
r58036 r58076 96 96 file.write(error) 97 97 elif error: 98 _log.debug("Previous test output extra lines after dump:\n%s" % 99 error) 98 _log.debug("Previous test output stderr lines:\n%s" % error) 100 99 101 100 # Check the output and save the results. -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
r58036 r58076 443 443 with open(self._image_path, "wb") as image_file: 444 444 image_file.write(image) 445 446 error_lines = self._server_process.error.splitlines() 447 error_eof = error_lines.pop() 448 assert(error_eof == "#EOF") 449 error = "\n".join(error_lines) 450 # FIXME: This seems like the wrong section of code to be doing 451 # this reset in. 452 self._server_process.error = "" 445 453 return (self._server_process.crashed, 446 454 self._server_process.timed_out, 447 455 actual_image_hash, 448 456 output, 449 self._server_process.error)457 error) 450 458 451 459 def stop(self):
Note: See TracChangeset
for help on using the changeset viewer.