Title: [114694] trunk
- Revision
- 114694
- Author
- [email protected]
- Date
- 2012-04-19 16:50:39 -0700 (Thu, 19 Apr 2012)
Log Message
[EFL] DRT console messages should contain only the file name part of local URIs
https://bugs.webkit.org/show_bug.cgi?id=84236
Patch by Christophe Dumez <[email protected]> on 2012-04-19
Reviewed by Kentaro Hara.
Tools:
Process console messages before printing them in EFL's DumpRenderTree
them so that they contain only the file name part of local URIs. This
is what is expected by test cases.
* DumpRenderTree/efl/DumpRenderTreeView.cpp:
(urlSuitableForTestResult):
(onConsoleMessage):
LayoutTests:
Remove from the skip list the tests which expect only the file name
part of local URIs to be displayed in console messages now that it has
been fixed in EFL's DumpRenderTree.
* platform/efl/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (114693 => 114694)
--- trunk/LayoutTests/ChangeLog 2012-04-19 23:46:20 UTC (rev 114693)
+++ trunk/LayoutTests/ChangeLog 2012-04-19 23:50:39 UTC (rev 114694)
@@ -1,3 +1,16 @@
+2012-04-19 Christophe Dumez <[email protected]>
+
+ [EFL] DRT console messages should contain only the file name part of local URIs
+ https://bugs.webkit.org/show_bug.cgi?id=84236
+
+ Reviewed by Kentaro Hara.
+
+ Remove from the skip list the tests which expect only the file name
+ part of local URIs to be displayed in console messages now that it has
+ been fixed in EFL's DumpRenderTree.
+
+ * platform/efl/Skipped:
+
2012-04-19 Florin Malita <[email protected]>
transforms/no_transform_hit_testing.html is flaky
Modified: trunk/LayoutTests/platform/efl/Skipped (114693 => 114694)
--- trunk/LayoutTests/platform/efl/Skipped 2012-04-19 23:46:20 UTC (rev 114693)
+++ trunk/LayoutTests/platform/efl/Skipped 2012-04-19 23:50:39 UTC (rev 114694)
@@ -1636,20 +1636,6 @@
# BUG: square button is not being drawn as a square
fast/css/square-button-appearance.html
-# BUG: The whole file path is being shown in the console message instead of only the file name.
-http/tests/misc/image-blocked-src-change.html
-http/tests/misc/image-blocked-src-no-change.html
-http/tests/misc/unloadable-script.html
-http/tests/security/frame-loading-via-document-write.html
-http/tests/security/local-CSS-from-remote.html
-http/tests/security/local-_javascript_-from-remote.html
-http/tests/security/local-iFrame-from-remote.html
-http/tests/security/local-image-from-remote.html
-http/tests/security/local-video-poster-from-remote.html
-http/tests/security/local-video-source-from-remote.html
-http/tests/security/local-video-src-from-remote.html
-media/csp-blocks-video.html
-
# BUG: Only works if --gui is passed (due to the current implementation of PlatformScreenEfl::screenRect).
fast/media/invalid-lengths.html
fast/media/matchmedium-query-api.html
Modified: trunk/Tools/ChangeLog (114693 => 114694)
--- trunk/Tools/ChangeLog 2012-04-19 23:46:20 UTC (rev 114693)
+++ trunk/Tools/ChangeLog 2012-04-19 23:50:39 UTC (rev 114694)
@@ -1,3 +1,18 @@
+2012-04-19 Christophe Dumez <[email protected]>
+
+ [EFL] DRT console messages should contain only the file name part of local URIs
+ https://bugs.webkit.org/show_bug.cgi?id=84236
+
+ Reviewed by Kentaro Hara.
+
+ Process console messages before printing them in EFL's DumpRenderTree
+ them so that they contain only the file name part of local URIs. This
+ is what is expected by test cases.
+
+ * DumpRenderTree/efl/DumpRenderTreeView.cpp:
+ (urlSuitableForTestResult):
+ (onConsoleMessage):
+
2012-04-19 Thiago Marcos P. Santos <[email protected]>
[EFL] [DRT] Should create offline storage inside DUMPRENDERTREE_TEMP
Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTreeView.cpp (114693 => 114694)
--- trunk/Tools/DumpRenderTree/efl/DumpRenderTreeView.cpp 2012-04-19 23:46:20 UTC (rev 114693)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTreeView.cpp 2012-04-19 23:50:39 UTC (rev 114694)
@@ -35,17 +35,37 @@
#include <Evas.h>
#include <cstdio>
#include <cstdlib>
+#include <wtf/NotFound.h>
+#include <wtf/text/CString.h>
+#include <wtf/text/WTFString.h>
using namespace std;
static Ewk_View_Smart_Class gParentSmartClass = EWK_VIEW_SMART_CLASS_INIT_NULL;
+static WTF::String urlSuitableForTestResult(const WTF::String& uriString)
+{
+ if (uriString.isEmpty() || !uriString.startsWith("file://"))
+ return uriString;
+
+ const size_t index = uriString.reverseFind('/');
+ return (index == WTF::notFound) ? uriString : uriString.substring(index + 1);
+}
+
static void onConsoleMessage(Ewk_View_Smart_Data*, const char* message, unsigned int lineNumber, const char*)
{
+ // Tests expect only the filename part of local URIs
+ WTF::String newMessage = message;
+ if (!newMessage.isEmpty()) {
+ const size_t fileProtocol = newMessage.find("file://");
+ if (fileProtocol != WTF::notFound)
+ newMessage = newMessage.left(fileProtocol) + urlSuitableForTestResult(newMessage.substring(fileProtocol));
+ }
+
printf("CONSOLE MESSAGE: ");
if (lineNumber)
printf("line %u: ", lineNumber);
- printf("%s\n", message);
+ printf("%s\n", newMessage.utf8().data());
}
static void onJavaScriptAlert(Ewk_View_Smart_Data*, Evas_Object*, const char* message)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
