Remove test results that match platform/mac results
authorddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Apr 2014 19:01:00 +0000 (19:01 +0000)
committerddkilzer@apple.com <ddkilzer@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 16 Apr 2014 19:01:00 +0000 (19:01 +0000)
Found using this shell script:

$ for F in `find LayoutTests/platform/ios-sim -name \*-expected.txt`; do \
T=`echo $F | sed -e 's#platform/ios-sim/##'`; \
M=`echo $F | sed -e 's#platform/ios-sim/#platform/mac/#'`; \
ML=`echo $F | sed -e 's#platform/ios-sim/#platform/mac-mountainlion/#'`; \
if [ -f $M -a ! -f $ML -a -z "`diff -u $F $M 2> /dev/null`" ]; then echo $F; fi; \
done

* platform/ios-sim/fast/block/positioning/016-expected.txt: Removed.
* platform/ios-sim/fast/block/positioning/025-expected.txt: Removed.
* platform/ios-sim/fast/dom/icon-url-property-expected.txt: Removed.
* platform/ios-sim/fast/hidpi/focus-rings-expected.txt: Removed.
* platform/ios-sim/fast/multicol/shrink-to-column-height-for-pagination-expected.txt: Removed.
* platform/ios-sim/fast/preloader/document-write-2-expected.txt: Removed.
* platform/ios-sim/fast/preloader/script-expected.txt: Removed.
* platform/ios-sim/fast/writing-mode/broken-ideograph-small-caps-expected.txt: Removed.
* platform/ios-sim/fast/xsl/sort-locale-expected.txt: Removed.
* platform/ios-sim/http/tests/security/mixedContent/insecure-audio-video-in-main-frame-expected.txt: Removed.
* platform/ios-sim/sputnik/Unicode/Unicode_320/S7.6_A2.2_T2-expected.txt: Removed.
* platform/ios-sim/sputnik/Unicode/Unicode_320/S7.6_A5.2_T8-expected.txt: Removed.
* platform/ios-sim/webarchive/loading/mainresource-null-mimetype-crash-expected.txt: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@167374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

14 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/ios-sim/fast/block/positioning/016-expected.txt [deleted file]
LayoutTests/platform/ios-sim/fast/block/positioning/025-expected.txt [deleted file]
LayoutTests/platform/ios-sim/fast/dom/icon-url-property-expected.txt [deleted file]
LayoutTests/platform/ios-sim/fast/hidpi/focus-rings-expected.txt [deleted file]
LayoutTests/platform/ios-sim/fast/multicol/shrink-to-column-height-for-pagination-expected.txt [deleted file]
LayoutTests/platform/ios-sim/fast/preloader/document-write-2-expected.txt [deleted file]
LayoutTests/platform/ios-sim/fast/preloader/script-expected.txt [deleted file]
LayoutTests/platform/ios-sim/fast/writing-mode/broken-ideograph-small-caps-expected.txt [deleted file]
LayoutTests/platform/ios-sim/fast/xsl/sort-locale-expected.txt [deleted file]
LayoutTests/platform/ios-sim/http/tests/security/mixedContent/insecure-audio-video-in-main-frame-expected.txt [deleted file]
LayoutTests/platform/ios-sim/sputnik/Unicode/Unicode_320/S7.6_A2.2_T2-expected.txt [deleted file]
LayoutTests/platform/ios-sim/sputnik/Unicode/Unicode_320/S7.6_A5.2_T8-expected.txt [deleted file]
LayoutTests/platform/ios-sim/webarchive/loading/mainresource-null-mimetype-crash-expected.txt [deleted file]

index 1b2cad926a6eb655ca6043dc19b57f3eb7506ee4..e793b0a1547b75988223c3dd6fe18e1d97aab086 100644 (file)
@@ -1,3 +1,30 @@
+2014-04-16  David Kilzer  <ddkilzer@apple.com>
+
+        Remove test results that match platform/mac results
+
+        Found using this shell script:
+
+        $ for F in `find LayoutTests/platform/ios-sim -name \*-expected.txt`; do \
+        T=`echo $F | sed -e 's#platform/ios-sim/##'`; \
+        M=`echo $F | sed -e 's#platform/ios-sim/#platform/mac/#'`; \
+        ML=`echo $F | sed -e 's#platform/ios-sim/#platform/mac-mountainlion/#'`; \
+        if [ -f $M -a ! -f $ML -a -z "`diff -u $F $M 2> /dev/null`" ]; then echo $F; fi; \
+        done
+
+        * platform/ios-sim/fast/block/positioning/016-expected.txt: Removed.
+        * platform/ios-sim/fast/block/positioning/025-expected.txt: Removed.
+        * platform/ios-sim/fast/dom/icon-url-property-expected.txt: Removed.
+        * platform/ios-sim/fast/hidpi/focus-rings-expected.txt: Removed.
+        * platform/ios-sim/fast/multicol/shrink-to-column-height-for-pagination-expected.txt: Removed.
+        * platform/ios-sim/fast/preloader/document-write-2-expected.txt: Removed.
+        * platform/ios-sim/fast/preloader/script-expected.txt: Removed.
+        * platform/ios-sim/fast/writing-mode/broken-ideograph-small-caps-expected.txt: Removed.
+        * platform/ios-sim/fast/xsl/sort-locale-expected.txt: Removed.
+        * platform/ios-sim/http/tests/security/mixedContent/insecure-audio-video-in-main-frame-expected.txt: Removed.
+        * platform/ios-sim/sputnik/Unicode/Unicode_320/S7.6_A2.2_T2-expected.txt: Removed.
+        * platform/ios-sim/sputnik/Unicode/Unicode_320/S7.6_A5.2_T8-expected.txt: Removed.
+        * platform/ios-sim/webarchive/loading/mainresource-null-mimetype-crash-expected.txt: Removed.
+
 2014-04-16  David Kilzer  <ddkilzer@apple.com>
 
         Remove test results that match top-level results
diff --git a/LayoutTests/platform/ios-sim/fast/block/positioning/016-expected.txt b/LayoutTests/platform/ios-sim/fast/block/positioning/016-expected.txt
deleted file mode 100644 (file)
index ca3d1e9..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x8
-  RenderBlock {HTML} at (0,0) size 800x8
-    RenderBody {BODY} at (8,8) size 784x0
-layer at (0,0) size 100x100
-  RenderBlock (positioned) {DIV} at (0,0) size 100x100
-layer at (0,0) size 100x100
-  RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
-layer at (0,0) size 100x100
-  RenderBlock (positioned) zI: 2 {DIV} at (0,0) size 100x100 [bgcolor=#008000]
-layer at (0,0) size 100x100
-  RenderBlock (positioned) zI: 1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
diff --git a/LayoutTests/platform/ios-sim/fast/block/positioning/025-expected.txt b/LayoutTests/platform/ios-sim/fast/block/positioning/025-expected.txt
deleted file mode 100644 (file)
index a2711cc..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x8
-  RenderBlock {HTML} at (0,0) size 800x8
-    RenderBody {BODY} at (8,8) size 784x0
-layer at (0,0) size 100x100 layerType: background only
-layer at (0,0) size 100x100
-  RenderBlock (positioned) zI: -1 {DIV} at (0,0) size 100x100 [bgcolor=#FF0000]
-layer at (0,0) size 100x100 layerType: foreground only
-  RenderBlock (positioned) {DIV} at (0,0) size 100x100 [bgcolor=#008000]
diff --git a/LayoutTests/platform/ios-sim/fast/dom/icon-url-property-expected.txt b/LayoutTests/platform/ios-sim/fast/dom/icon-url-property-expected.txt
deleted file mode 100644 (file)
index 0c0ffce..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-Original iconURL is: http://test.com/oldfavicon.ico
-Setting new icon URL to: http://test.com/newfavicon.ico
-New iconURL is: http://test.com/newfavicon.ico
-PASS - URL list matches expected
diff --git a/LayoutTests/platform/ios-sim/fast/hidpi/focus-rings-expected.txt b/LayoutTests/platform/ios-sim/fast/hidpi/focus-rings-expected.txt
deleted file mode 100644 (file)
index 99901e0..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {DIV} at (0,0) size 302x152 [border: (1px solid #000000)]
diff --git a/LayoutTests/platform/ios-sim/fast/multicol/shrink-to-column-height-for-pagination-expected.txt b/LayoutTests/platform/ios-sim/fast/multicol/shrink-to-column-height-for-pagination-expected.txt
deleted file mode 100644 (file)
index 882e9c6..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (384,0) size 416x600
-  RenderBlock {HTML} at (0,0) size 416x600
-    RenderBody {BODY} at (8,8) size 400x600
-      RenderBlock {DIV} at (0,0) size 400x600
-        RenderImage {IMG} at (392,0) size 400x600
-        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/ios-sim/fast/preloader/document-write-2-expected.txt b/LayoutTests/platform/ios-sim/fast/preloader/document-write-2-expected.txt
deleted file mode 100644 (file)
index 9a1e1d6..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-document-write-plaintext.js has MIME type text/javascript
-script1.js has MIME type text/javascript
-
-This test requires DumpRenderTree to see the log of what resources are loaded. 
-
-The first script document.writes a plaintext tag so the main parser will not load the subsequent resources. Preload scanner won't know this so it will still kick off the loads, allowing us to verify that preloading is working as expected.
diff --git a/LayoutTests/platform/ios-sim/fast/preloader/script-expected.txt b/LayoutTests/platform/ios-sim/fast/preloader/script-expected.txt
deleted file mode 100644 (file)
index e2089b1..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-script1.js has MIME type text/javascript
-This test requires DumpRenderTree to see the log of what resources are loaded.
-
-<script src=resources/script1.js></script>
-
diff --git a/LayoutTests/platform/ios-sim/fast/writing-mode/broken-ideograph-small-caps-expected.txt b/LayoutTests/platform/ios-sim/fast/writing-mode/broken-ideograph-small-caps-expected.txt
deleted file mode 100644 (file)
index dd5f8f3..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x377
-  RenderBlock {HTML} at (0,0) size 800x377
-    RenderBody {BODY} at (50,50) size 700x277
-      RenderBlock {DIV} at (0,0) size 556x277 [bgcolor=#EEEEEE]
-        RenderBlock {DIV} at (1,1) size 277x129 [bgcolor=#FFEEEE]
-          RenderBlock {P} at (14,28) size 249x23 [bgcolor=#FFAAAA] [border: none (20px solid #FF8888) none (20px solid #FF8888)]
-            RenderText {#text} at (21,1) size 176x20
-              text run at (21,1) width 176: "\x{7B2C}\x{4E00}\x{6BB5}\x{843D} Paragraph 1"
-          RenderBlock {P} at (14,78) size 249x22 [bgcolor=#FFAAAA] [border: none (20px solid #FF8888) none (20px solid #FF8888)]
-            RenderText {#text} at (21,1) size 176x20
-              text run at (21,1) width 176: "\x{7B2C}\x{4E8C}\x{6BB5}\x{843D} Paragraph 2"
-        RenderBlock {DIV} at (278,1) size 277x275 [bgcolor=#FFFFEE]
-          RenderBlock {P} at (14,28) size 83x219 [bgcolor=#FFAAAA] [border: none (20px solid #FF8888) none (20px solid #FF8888)]
-            RenderText {#text} at (21,1) size 40x207
-              text run at (21,1) width 207: "\x{7B2C}\x{4E00}\x{6BB5}\x{843D} Paragraph"
-              text run at (41,1) width 10: "1"
-          RenderBlock {P} at (110,28) size 83x219 [bgcolor=#FFAAAA] [border: none (20px solid #FF8888) none (20px solid #FF8888)]
-            RenderText {#text} at (21,1) size 40x207
-              text run at (21,1) width 207: "\x{7B2C}\x{4E8C}\x{6BB5}\x{843D} Paragraph"
-              text run at (41,1) width 10: "2"
diff --git a/LayoutTests/platform/ios-sim/fast/xsl/sort-locale-expected.txt b/LayoutTests/platform/ios-sim/fast/xsl/sort-locale-expected.txt
deleted file mode 100644 (file)
index 213f954..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-en
-
-peach
-péché
-pêche
-sin
-fr
-
-peach
-péché
-pêche
-sin
-fr-CA
-
-peach
-pêche
-péché
-sin
diff --git a/LayoutTests/platform/ios-sim/http/tests/security/mixedContent/insecure-audio-video-in-main-frame-expected.txt b/LayoutTests/platform/ios-sim/http/tests/security/mixedContent/insecure-audio-video-in-main-frame-expected.txt
deleted file mode 100644 (file)
index 5e22650..0000000
+++ /dev/null
@@ -1 +0,0 @@
-This test opens a window that loads insecure HTML5 audio and video. We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content.
diff --git a/LayoutTests/platform/ios-sim/sputnik/Unicode/Unicode_320/S7.6_A2.2_T2-expected.txt b/LayoutTests/platform/ios-sim/sputnik/Unicode/Unicode_320/S7.6_A2.2_T2-expected.txt
deleted file mode 100644 (file)
index 657ffbf..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-S7.6_A2.2_T2
-
-PASS 
-
-TEST COMPLETE
-
diff --git a/LayoutTests/platform/ios-sim/sputnik/Unicode/Unicode_320/S7.6_A5.2_T8-expected.txt b/LayoutTests/platform/ios-sim/sputnik/Unicode/Unicode_320/S7.6_A5.2_T8-expected.txt
deleted file mode 100644 (file)
index 77e8e7d..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-S7.6_A5.2_T8
-
-PASS 
-
-TEST COMPLETE
-
diff --git a/LayoutTests/platform/ios-sim/webarchive/loading/mainresource-null-mimetype-crash-expected.txt b/LayoutTests/platform/ios-sim/webarchive/loading/mainresource-null-mimetype-crash-expected.txt
deleted file mode 100644 (file)
index 3c3cdac..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didCommitLoadForFrame
-main frame - willPerformClientRedirectToURL: resources/mainresource-null-mimetype.webarchive 
-main frame - didFinishDocumentLoadForFrame
-main frame - didFinishLoadForFrame
-