Diff
Modified: trunk/LayoutTests/ChangeLog (119729 => 119730)
--- trunk/LayoutTests/ChangeLog 2012-06-07 16:05:19 UTC (rev 119729)
+++ trunk/LayoutTests/ChangeLog 2012-06-07 16:50:22 UTC (rev 119730)
@@ -1,3 +1,18 @@
+2012-06-07 Brady Eidson <beid...@apple.com>
+
+ https://bugs.webkit.org/show_bug.cgi?id=88481
+
+ Move new test added by r119644 that was only meant for platform/mac into the platform/mac directory:
+ * platform/mac/fast/loader/resources/utf8-encoded.webarchive: Renamed from LayoutTests/fast/loader/resources/utf8-encoded.webarchive.
+ * platform/mac/fast/loader/webarchive-encoding-respected-expected.txt: Renamed from LayoutTests/fast/loader/webarchive-encoding-respected-expected.txt.
+ * platform/mac/fast/loader/webarchive-encoding-respected.html: Renamed from LayoutTests/fast/loader/webarchive-encoding-respected.html.
+
+ Also remove it from the TestExpectations files for platforms where it was Skipped:
+ * platform/chromium/TestExpectations:
+ * platform/efl/TestExpectations:
+ * platform/gtk/TestExpectations:
+ * platform/qt/TestExpectations:
+
2012-06-07 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r119707.
Deleted: trunk/LayoutTests/fast/loader/resources/utf8-encoded.webarchive (119729 => 119730)
--- trunk/LayoutTests/fast/loader/resources/utf8-encoded.webarchive 2012-06-07 16:05:19 UTC (rev 119729)
+++ trunk/LayoutTests/fast/loader/resources/utf8-encoded.webarchive 2012-06-07 16:50:22 UTC (rev 119730)
@@ -1,4 +0,0 @@
-bplist00\xD1_WebMainResource\xD5
- _WebResourceMIMEType_WebResourceTextEncodingName_WebResourceFrameName^WebResourceURL_WebResourceDataYtext/htmlUUTF-8P_ http://127.0.0.1:8000/utf-8.cgiOs<html><head></head><body>This content is UTF-8 encoded and includes a Hebrew Resh character -> ר
-</body></html> ( > \ s \x82 \x94 \x9E \xA4 \xA5 \xC7
- =
\ No newline at end of file
Deleted: trunk/LayoutTests/fast/loader/webarchive-encoding-respected-expected.txt (119729 => 119730)
--- trunk/LayoutTests/fast/loader/webarchive-encoding-respected-expected.txt 2012-06-07 16:05:19 UTC (rev 119729)
+++ trunk/LayoutTests/fast/loader/webarchive-encoding-respected-expected.txt 2012-06-07 16:50:22 UTC (rev 119730)
@@ -1,7 +0,0 @@
-The webarchive in this iframe is utf-8 encoded and will only display properly if the webarchive's encoding is respected.
-
-
---------
-Frame: '<!--framePath //<!--frame0-->-->'
---------
-This content is UTF-8 encoded and includes a Hebrew Resh character -> ר
Deleted: trunk/LayoutTests/fast/loader/webarchive-encoding-respected.html (119729 => 119730)
--- trunk/LayoutTests/fast/loader/webarchive-encoding-respected.html 2012-06-07 16:05:19 UTC (rev 119729)
+++ trunk/LayoutTests/fast/loader/webarchive-encoding-respected.html 2012-06-07 16:50:22 UTC (rev 119730)
@@ -1,8 +0,0 @@
-<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.dumpChildFramesAsText();
-}
-</script>
-The webarchive in this iframe is utf-8 encoded and will only display properly if the webarchive's encoding is respected.<br>
-<iframe src=""
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (119729 => 119730)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-06-07 16:05:19 UTC (rev 119729)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-06-07 16:50:22 UTC (rev 119730)
@@ -3782,6 +3782,3 @@
//BUGCR84157 WIN : platform/chromium/virtual/gpu/fast/canvas/canvas-currentColor.html = TEXT
BUGCR131187 : platform/chromium/virtual/gpu/canvas/philip/tests/2d.gradient.radial.cone.cylinder.html = TEXT
BUGCR131187 : platform/chromium/virtual/gpu/fast/canvas/canvas-currentColor.html = TEXT
-
-BUGWK88481 : fast/loader/webarchive-encoding-respected.html = TEXT
-
Modified: trunk/LayoutTests/platform/efl/TestExpectations (119729 => 119730)
--- trunk/LayoutTests/platform/efl/TestExpectations 2012-06-07 16:05:19 UTC (rev 119729)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2012-06-07 16:50:22 UTC (rev 119730)
@@ -722,5 +722,3 @@
// These tests do not seem to fail anywhere else.
BUGWK88030 : fast/multicol/column-break-with-balancing.html = IMAGE
BUGWK88031 : fast/multicol/span/generated-child-split-flow-crash.html = TEXT
-
-BUGWK88481 : fast/loader/webarchive-encoding-respected.html = TEXT
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (119729 => 119730)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2012-06-07 16:05:19 UTC (rev 119729)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2012-06-07 16:50:22 UTC (rev 119730)
@@ -1310,8 +1310,6 @@
BUGWK88138 : http/tests/media/video-buffered.html = TEXT
-BUGWK88481 : fast/loader/webarchive-encoding-respected.html = TEXT
-
//////////////////////////////////////////////////////////////////////////////////////////
// End of Tests failing
//////////////////////////////////////////////////////////////////////////////////////////
Copied: trunk/LayoutTests/platform/mac/fast/loader/resources/utf8-encoded.webarchive (from rev 119729, trunk/LayoutTests/fast/loader/resources/utf8-encoded.webarchive) (0 => 119730)
--- trunk/LayoutTests/platform/mac/fast/loader/resources/utf8-encoded.webarchive (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/loader/resources/utf8-encoded.webarchive 2012-06-07 16:50:22 UTC (rev 119730)
@@ -0,0 +1,4 @@
+bplist00\xD1_WebMainResource\xD5
+ _WebResourceMIMEType_WebResourceTextEncodingName_WebResourceFrameName^WebResourceURL_WebResourceDataYtext/htmlUUTF-8P_ http://127.0.0.1:8000/utf-8.cgiOs<html><head></head><body>This content is UTF-8 encoded and includes a Hebrew Resh character -> ר
+</body></html> ( > \ s \x82 \x94 \x9E \xA4 \xA5 \xC7
+ =
\ No newline at end of file
Copied: trunk/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected-expected.txt (from rev 119729, trunk/LayoutTests/fast/loader/webarchive-encoding-respected-expected.txt) (0 => 119730)
--- trunk/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected-expected.txt 2012-06-07 16:50:22 UTC (rev 119730)
@@ -0,0 +1,7 @@
+The webarchive in this iframe is utf-8 encoded and will only display properly if the webarchive's encoding is respected.
+
+
+--------
+Frame: '<!--framePath //<!--frame0-->-->'
+--------
+This content is UTF-8 encoded and includes a Hebrew Resh character -> ר
Copied: trunk/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected.html (from rev 119729, trunk/LayoutTests/fast/loader/webarchive-encoding-respected.html) (0 => 119730)
--- trunk/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/loader/webarchive-encoding-respected.html 2012-06-07 16:50:22 UTC (rev 119730)
@@ -0,0 +1,8 @@
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.dumpChildFramesAsText();
+}
+</script>
+The webarchive in this iframe is utf-8 encoded and will only display properly if the webarchive's encoding is respected.<br>
+<iframe src=""
Modified: trunk/LayoutTests/platform/qt/TestExpectations (119729 => 119730)
--- trunk/LayoutTests/platform/qt/TestExpectations 2012-06-07 16:05:19 UTC (rev 119729)
+++ trunk/LayoutTests/platform/qt/TestExpectations 2012-06-07 16:50:22 UTC (rev 119730)
@@ -91,5 +91,3 @@
// LayoutTestController::setAutomaticLinkDetectionEnabled isn't implemented
BUGWK85463 SKIP : editing/inserting/typing-space-to-trigger-smart-link.html = FAIL
-
-BUGWK88481 : fast/loader/webarchive-encoding-respected.html = TEXT
