Title: [98071] trunk/Tools
Revision
98071
Author
e...@webkit.org
Date
2011-10-20 23:30:01 -0700 (Thu, 20 Oct 2011)

Log Message

NRWT is asserting on DRT due to lack of newline when processing line from DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=70585

Reviewed by Adam Barth.

This really should be an assert, as this inidicates a programming error in either DRT or NRWT.
However since DRT was functioning fine before in Qt, we'll make this an error log for now
and once we find the root cause flip this back to an assert.

* Scripts/webkitpy/layout_tests/port/webkit.py:

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (98070 => 98071)


--- trunk/Tools/ChangeLog	2011-10-21 06:28:53 UTC (rev 98070)
+++ trunk/Tools/ChangeLog	2011-10-21 06:30:01 UTC (rev 98071)
@@ -1,3 +1,16 @@
+2011-10-20  Eric Seidel  <e...@webkit.org>
+
+        NRWT is asserting on DRT due to lack of newline when processing line from DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=70585
+
+        Reviewed by Adam Barth.
+
+        This really should be an assert, as this inidicates a programming error in either DRT or NRWT.
+        However since DRT was functioning fine before in Qt, we'll make this an error log for now
+        and once we find the root cause flip this back to an assert.
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
 2011-10-20  Yuta Kitamura  <yu...@chromium.org>
 
         Unreviewed, rolling out r98064.

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py (98070 => 98071)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py	2011-10-21 06:28:53 UTC (rev 98070)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py	2011-10-21 06:30:01 UTC (rev 98071)
@@ -595,7 +595,8 @@
                 err_line, self.err_seen_eof = self._strip_eof(err_line)
 
             if out_line:
-                assert out_line[-1] == "\n", "Missing newline"
+                if out_line[-1] != "\n":
+                    _log.error("Last character read from DRT stdout line was not a newline!  This indicates either a NRWT or DRT bug.")
                 content_length_before_header_check = block._content_length
                 self._process_stdout_line(block, out_line)
                 # FIXME: Unlike HTTP, DRT dumps the content right after printing a Content-Length header.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to