Title: [140258] trunk
Revision
140258
Author
[email protected]
Date
2013-01-19 13:11:31 -0800 (Sat, 19 Jan 2013)

Log Message

[WK2] svg/dom/fuzz-path-parser.html is failing
https://bugs.webkit.org/show_bug.cgi?id=107133

Patch by Zan Dobersek <[email protected]> on 2013-01-19
Reviewed by Alexey Proskuryakov.

Tools:

Console messages can contain null characters before the end of string.
Appending such message to the StringBuilder as a WTFString appends the
complete string, including the null character. This later cuts off everything
after the null character when the string is being printed out to the test
output.

To avoid this, truncate the string up to the first null character. This
preserves the newline character appended immediately after this and
stops giving incorrect output.

* WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
(WTR::InjectedBundlePage::willAddMessageToConsole):

LayoutTests:

Unskip the now-passing test.

* platform/gtk-wk2/TestExpectations:
* platform/wk2/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (140257 => 140258)


--- trunk/LayoutTests/ChangeLog	2013-01-19 21:02:17 UTC (rev 140257)
+++ trunk/LayoutTests/ChangeLog	2013-01-19 21:11:31 UTC (rev 140258)
@@ -1,3 +1,15 @@
+2013-01-19  Zan Dobersek  <[email protected]>
+
+        [WK2] svg/dom/fuzz-path-parser.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=107133
+
+        Reviewed by Alexey Proskuryakov.
+
+        Unskip the now-passing test.
+
+        * platform/gtk-wk2/TestExpectations:
+        * platform/wk2/TestExpectations:
+
 2013-01-19  Dominik Röttsches  <[email protected]>
 
         [EFL] Unreviewed gardening.

Modified: trunk/LayoutTests/platform/gtk-wk2/TestExpectations (140257 => 140258)


--- trunk/LayoutTests/platform/gtk-wk2/TestExpectations	2013-01-19 21:02:17 UTC (rev 140257)
+++ trunk/LayoutTests/platform/gtk-wk2/TestExpectations	2013-01-19 21:11:31 UTC (rev 140258)
@@ -338,7 +338,6 @@
 Bug(GTK) svg/custom/gradient-attr-update.svg [ Failure Pass ]
 Bug(GTK) svg/custom/pointer-events-on-svg-with-pointer.xhtml [ Failure Pass ]
 Bug(GTK) svg/custom/pointer-events-on-svg-without-pointer.xhtml [ Failure Pass ]
-Bug(WK2) svg/dom/fuzz-path-parser.html [ Failure ]
 Bug(WK2) svg/hixie/cascade/002.xml [ Failure ]
 Bug(GTK) svg/stroke/non-scaling-stroke-pattern.svg [ ImageOnlyFailure Pass ]
 Bug(GTK) svg/text/select-textLength-spacingAndGlyphs-squeeze-1.svg [ Failure ]

Modified: trunk/LayoutTests/platform/wk2/TestExpectations (140257 => 140258)


--- trunk/LayoutTests/platform/wk2/TestExpectations	2013-01-19 21:02:17 UTC (rev 140257)
+++ trunk/LayoutTests/platform/wk2/TestExpectations	2013-01-19 21:11:31 UTC (rev 140258)
@@ -681,7 +681,6 @@
 plugins/plugin-initiate-popup-window.html
 storage/websql/open-database-while-transaction-in-progress.html
 svg/custom/clip-path-referencing-use2.svg
-svg/dom/fuzz-path-parser.html
 svg/hixie/cascade/002.xml
 tables/mozilla_expected_failures/bugs/bug8499.html
 transitions/font-family-during-transition.html

Modified: trunk/Tools/ChangeLog (140257 => 140258)


--- trunk/Tools/ChangeLog	2013-01-19 21:02:17 UTC (rev 140257)
+++ trunk/Tools/ChangeLog	2013-01-19 21:11:31 UTC (rev 140258)
@@ -1,3 +1,23 @@
+2013-01-19  Zan Dobersek  <[email protected]>
+
+        [WK2] svg/dom/fuzz-path-parser.html is failing
+        https://bugs.webkit.org/show_bug.cgi?id=107133
+
+        Reviewed by Alexey Proskuryakov.
+
+        Console messages can contain null characters before the end of string.
+        Appending such message to the StringBuilder as a WTFString appends the
+        complete string, including the null character. This later cuts off everything
+        after the null character when the string is being printed out to the test
+        output.
+
+        To avoid this, truncate the string up to the first null character. This
+        preserves the newline character appended immediately after this and
+        stops giving incorrect output.
+
+        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+        (WTR::InjectedBundlePage::willAddMessageToConsole):
+
 2013-01-19  Eric Seidel  <[email protected]>
 
         Update error regexps so that Parser/html-parser-srcdoc.html can "pass"

Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (140257 => 140258)


--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp	2013-01-19 21:02:17 UTC (rev 140257)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp	2013-01-19 21:11:31 UTC (rev 140258)
@@ -1430,6 +1430,10 @@
         return;
 
     WTF::String messageString = toWTFString(message);
+    unsigned nullCharPos = messageString.find(UChar(0));
+    if (nullCharPos != WTF::notFound)
+        messageString.truncate(nullCharPos);
+
     size_t fileProtocolStart = messageString.find("file://");
     if (fileProtocolStart != WTF::notFound)
         // FIXME: The code below does not handle additional text after url nor multiple urls. This matches DumpRenderTree implementation.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to