Change the layout test result search policy for Mac OS X to fit better with the idea of
authormrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Mar 2009 12:19:47 +0000 (12:19 +0000)
committermrowe@apple.com <mrowe@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 14 Mar 2009 12:19:47 +0000 (12:19 +0000)
newer OS versions improving on previous OS versions.

Reviewed by Dan Bernstein.

The results for the latest version of Mac OS X are placed in the "mac" directory.  The
results for older versions of Mac OS X are structured as a series of overlays.  When
running on Leopard, the results in "mac-leopard" are searched before those in "mac".
When running on Tiger, the results in "mac-tiger" are searched before those in
"mac-leopard" and "mac".

* Scripts/run-webkit-tests:

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

43 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/mac-leopard/Skipped
LayoutTests/platform/mac-leopard/accessibility/lists-expected.txt [moved from LayoutTests/accessibility/lists-expected.txt with 100% similarity]
LayoutTests/platform/mac-leopard/accessibility/table-attributes-expected.txt [moved from LayoutTests/accessibility/table-attributes-expected.txt with 100% similarity]
LayoutTests/platform/mac-leopard/accessibility/table-cell-spans-expected.txt [moved from LayoutTests/accessibility/table-cell-spans-expected.txt with 100% similarity]
LayoutTests/platform/mac-leopard/accessibility/table-cells-expected.txt [moved from LayoutTests/accessibility/table-cells-expected.txt with 100% similarity]
LayoutTests/platform/mac-leopard/accessibility/table-detection-expected.txt [moved from LayoutTests/accessibility/table-detection-expected.txt with 100% similarity]
LayoutTests/platform/mac-leopard/accessibility/table-sections-expected.txt [moved from LayoutTests/accessibility/table-sections-expected.txt with 100% similarity]
LayoutTests/platform/mac-leopard/accessibility/table-with-aria-role-expected.txt [moved from LayoutTests/accessibility/table-with-aria-role-expected.txt with 100% similarity]
LayoutTests/platform/mac-leopard/accessibility/table-with-rules-expected.txt [moved from LayoutTests/accessibility/table-with-rules-expected.txt with 100% similarity]
LayoutTests/platform/mac-leopard/fast/text/atsui-multiple-renderers-expected.checksum [new file with mode: 0644]
LayoutTests/platform/mac-leopard/fast/text/atsui-multiple-renderers-expected.png [new file with mode: 0644]
LayoutTests/platform/mac-leopard/fast/text/atsui-multiple-renderers-expected.txt [moved from LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.txt with 77% similarity]
LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.checksum [deleted file]
LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.png [deleted file]
LayoutTests/platform/mac-tiger/Skipped
LayoutTests/platform/mac/accessibility/lists-expected.txt [moved from LayoutTests/platform/mac-snowleopard/accessibility/lists-expected.txt with 100% similarity]
LayoutTests/platform/mac/accessibility/table-attributes-expected.txt [moved from LayoutTests/platform/mac-snowleopard/accessibility/table-attributes-expected.txt with 100% similarity]
LayoutTests/platform/mac/accessibility/table-cell-spans-expected.txt [moved from LayoutTests/platform/mac-snowleopard/accessibility/table-cell-spans-expected.txt with 100% similarity]
LayoutTests/platform/mac/accessibility/table-cells-expected.txt [moved from LayoutTests/platform/mac-snowleopard/accessibility/table-cells-expected.txt with 100% similarity]
LayoutTests/platform/mac/accessibility/table-detection-expected.txt [moved from LayoutTests/platform/mac-snowleopard/accessibility/table-detection-expected.txt with 100% similarity]
LayoutTests/platform/mac/accessibility/table-multi-bodies-expected.txt [moved from LayoutTests/platform/mac-snowleopard/accessibility/table-multi-bodies-expected.txt with 100% similarity]
LayoutTests/platform/mac/accessibility/table-multi-bodies.html [moved from LayoutTests/platform/mac-snowleopard/accessibility/table-multi-bodies.html with 100% similarity]
LayoutTests/platform/mac/accessibility/table-sections-expected.txt [moved from LayoutTests/platform/mac-snowleopard/accessibility/table-sections-expected.txt with 100% similarity]
LayoutTests/platform/mac/accessibility/table-updating-expected.txt [moved from LayoutTests/platform/mac-snowleopard/accessibility/table-updating-expected.txt with 100% similarity]
LayoutTests/platform/mac/accessibility/table-updating.html [moved from LayoutTests/platform/mac-snowleopard/accessibility/table-updating.html with 100% similarity]
LayoutTests/platform/mac/accessibility/table-with-aria-role-expected.txt [moved from LayoutTests/platform/mac-snowleopard/accessibility/table-with-aria-role-expected.txt with 100% similarity]
LayoutTests/platform/mac/accessibility/table-with-rules-expected.txt [moved from LayoutTests/platform/mac-snowleopard/accessibility/table-with-rules-expected.txt with 100% similarity]
LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.checksum
LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.png
LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.txt
LayoutTests/platform/mac/fast/text/myanmar-shaping-expected.checksum [moved from LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.checksum with 100% similarity]
LayoutTests/platform/mac/fast/text/myanmar-shaping-expected.png [moved from LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.png with 100% similarity]
LayoutTests/platform/mac/fast/text/myanmar-shaping-expected.txt [moved from LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.txt with 100% similarity]
LayoutTests/platform/mac/fast/text/myanmar-shaping.html [moved from LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping.html with 100% similarity]
LayoutTests/platform/mac/fast/text/resources/Garuda.ttf [moved from LayoutTests/platform/mac-snowleopard/fast/text/resources/Garuda.ttf with 100% similarity]
LayoutTests/platform/mac/fast/text/resources/mm3.ttf [moved from LayoutTests/platform/mac-snowleopard/fast/text/resources/mm3.ttf with 100% similarity]
LayoutTests/platform/mac/fast/text/thai-combining-mark-positioning-expected.checksum [moved from LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.checksum with 100% similarity]
LayoutTests/platform/mac/fast/text/thai-combining-mark-positioning-expected.png [moved from LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.png with 100% similarity]
LayoutTests/platform/mac/fast/text/thai-combining-mark-positioning-expected.txt [moved from LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.txt with 100% similarity]
LayoutTests/platform/mac/fast/text/thai-combining-mark-positioning.html [moved from LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning.html with 100% similarity]
WebKitTools/ChangeLog
WebKitTools/Scripts/run-webkit-tests

index 5acdb07..1f5c0bf 100644 (file)
@@ -1,3 +1,48 @@
+2009-03-14  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Shuffle layout tests and expected results around to fit the new search policy.
+
+        * platform/mac-leopard/Skipped:
+        * platform/mac-leopard/accessibility/lists-expected.txt: Renamed from LayoutTests/accessibility/lists-expected.txt.
+        * platform/mac-leopard/accessibility/table-attributes-expected.txt: Renamed from LayoutTests/accessibility/table-attributes-expected.txt.
+        * platform/mac-leopard/accessibility/table-cell-spans-expected.txt: Renamed from LayoutTests/accessibility/table-cell-spans-expected.txt.
+        * platform/mac-leopard/accessibility/table-cells-expected.txt: Renamed from LayoutTests/accessibility/table-cells-expected.txt.
+        * platform/mac-leopard/accessibility/table-detection-expected.txt: Renamed from LayoutTests/accessibility/table-detection-expected.txt.
+        * platform/mac-leopard/accessibility/table-sections-expected.txt: Renamed from LayoutTests/accessibility/table-sections-expected.txt.
+        * platform/mac-leopard/accessibility/table-with-aria-role-expected.txt: Renamed from LayoutTests/accessibility/table-with-aria-role-expected.txt.
+        * platform/mac-leopard/accessibility/table-with-rules-expected.txt: Renamed from LayoutTests/accessibility/table-with-rules-expected.txt.
+        * platform/mac-leopard/fast/text/atsui-multiple-renderers-expected.checksum: Copied from LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.checksum.
+        * platform/mac-leopard/fast/text/atsui-multiple-renderers-expected.png: Copied from LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.png.
+        * platform/mac-leopard/fast/text/atsui-multiple-renderers-expected.txt: Copied from LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.txt.
+        * platform/mac-tiger/Skipped:
+        * platform/mac/accessibility/lists-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/lists-expected.txt.
+        * platform/mac/accessibility/table-attributes-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/table-attributes-expected.txt.
+        * platform/mac/accessibility/table-cell-spans-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/table-cell-spans-expected.txt.
+        * platform/mac/accessibility/table-cells-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/table-cells-expected.txt.
+        * platform/mac/accessibility/table-detection-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/table-detection-expected.txt.
+        * platform/mac/accessibility/table-multi-bodies-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/table-multi-bodies-expected.txt.
+        * platform/mac/accessibility/table-multi-bodies.html: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/table-multi-bodies.html.
+        * platform/mac/accessibility/table-sections-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/table-sections-expected.txt.
+        * platform/mac/accessibility/table-updating-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/table-updating-expected.txt.
+        * platform/mac/accessibility/table-updating.html: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/table-updating.html.
+        * platform/mac/accessibility/table-with-aria-role-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/table-with-aria-role-expected.txt.
+        * platform/mac/accessibility/table-with-rules-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/accessibility/table-with-rules-expected.txt.
+        * platform/mac/fast/text/atsui-multiple-renderers-expected.checksum: Renamed from platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.checksum.
+        * platform/mac/fast/text/atsui-multiple-renderers-expected.png: Renamed from platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.png.
+        * platform/mac/fast/text/atsui-multiple-renderers-expected.txt: Renamed from platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.txt.
+        * platform/mac/fast/text/myanmar-shaping-expected.checksum: Renamed from LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.checksum.
+        * platform/mac/fast/text/myanmar-shaping-expected.png: Renamed from LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.png.
+        * platform/mac/fast/text/myanmar-shaping-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping-expected.txt.
+        * platform/mac/fast/text/myanmar-shaping.html: Renamed from LayoutTests/platform/mac-snowleopard/fast/text/myanmar-shaping.html.
+        * platform/mac/fast/text/resources/Garuda.ttf: Renamed from LayoutTests/platform/mac-snowleopard/fast/text/resources/Garuda.ttf.
+        * platform/mac/fast/text/resources/mm3.ttf: Renamed from LayoutTests/platform/mac-snowleopard/fast/text/resources/mm3.ttf.
+        * platform/mac/fast/text/thai-combining-mark-positioning-expected.checksum: Renamed from LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.checksum.
+        * platform/mac/fast/text/thai-combining-mark-positioning-expected.png: Renamed from LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.png.
+        * platform/mac/fast/text/thai-combining-mark-positioning-expected.txt: Renamed from LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning-expected.txt.
+        * platform/mac/fast/text/thai-combining-mark-positioning.html: Renamed from LayoutTests/platform/mac-snowleopard/fast/text/thai-combining-mark-positioning.html.
+
 2009-03-14  Alexey Proskuryakov  <ap@webkit.org>
 
         Reviewed by Darin Adler.
index 81815da..0f6caf2 100644 (file)
@@ -7,3 +7,10 @@ svg/css/glyph-orientation-rounding-test.xhtml
 
 # <rdar://problem/5539822> REGRESSION (Leopard): svg/custom/stroke-width-click.svg test failing
 svg/custom/stroke-width-click.svg
+
+# Tests of table accessibility functionality not supported on Leopard
+platform/mac/accessibility/table-multi-bodies.html
+
+# Tests of font features not supported by ATSUI
+platform/mac/fast/text/myanmar-shaping.html
+platform/mac/fast/text/thai-combining-mark-positioning.html
diff --git a/LayoutTests/platform/mac-leopard/fast/text/atsui-multiple-renderers-expected.checksum b/LayoutTests/platform/mac-leopard/fast/text/atsui-multiple-renderers-expected.checksum
new file mode 100644 (file)
index 0000000..e29f9cf
--- /dev/null
@@ -0,0 +1 @@
+8fc1f2da636471f2692e78fe3cafdcac
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-leopard/fast/text/atsui-multiple-renderers-expected.png b/LayoutTests/platform/mac-leopard/fast/text/atsui-multiple-renderers-expected.png
new file mode 100644 (file)
index 0000000..c22231c
Binary files /dev/null and b/LayoutTests/platform/mac-leopard/fast/text/atsui-multiple-renderers-expected.png differ
@@ -16,73 +16,73 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,70) size 784x18
         RenderText {#text} at (0,0) size 600x18
           text run at (0,0) width 600: "The two columns should be identical except for the accent over the e and the umlaut over the u."
-      RenderTable {TABLE} at (0,104) size 263x147 [border: none]
-        RenderTableSection {TBODY} at (0,0) size 262x146
-          RenderTableRow {TR} at (0,0) size 262x30
-            RenderTableCell {TD} at (0,0) size 131x30 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1]
+      RenderTable {TABLE} at (0,104) size 264x147 [border: none]
+        RenderTableSection {TBODY} at (0,0) size 263x146
+          RenderTableRow {TR} at (0,0) size 263x30
+            RenderTableCell {TD} at (0,0) size 132x30 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (2,3) size 69x25
                 text run at (2,3) width 69: "Lore\x{300}m "
               RenderInline {SPAN} at (0,0) size 50x23
                 RenderText {#text} at (71,5) size 50x23
                   text run at (71,5) width 50: "ipsu\x{308}m"
               RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (131,0) size 131x30 [border: (1px solid #008000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (132,0) size 131x30 [border: (1px solid #008000)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (2,3) size 69x25
                 text run at (2,3) width 69: "Lorem "
               RenderInline {SPAN} at (0,0) size 50x23
                 RenderText {#text} at (71,5) size 50x23
                   text run at (71,5) width 50: "ipsum"
               RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,30) size 262x30
-            RenderTableCell {TD} at (0,30) size 131x30 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 75x25
-                text run at (2,3) width 75: "Lore\x{300}m "
+          RenderTableRow {TR} at (0,30) size 263x30
+            RenderTableCell {TD} at (0,30) size 132x30 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 76x25
+                text run at (2,3) width 76: "Lore\x{300}m "
               RenderInline {SPAN} at (0,0) size 53x23
-                RenderText {#text} at (77,5) size 53x23
-                  text run at (77,5) width 53: "ipsu\x{308}m"
+                RenderText {#text} at (78,5) size 53x23
+                  text run at (78,5) width 53: "ipsu\x{308}m"
               RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (131,30) size 131x30 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (132,30) size 131x30 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (2,3) size 75x25
                 text run at (2,3) width 75: "Lorem "
               RenderInline {SPAN} at (0,0) size 53x23
                 RenderText {#text} at (77,5) size 53x23
                   text run at (77,5) width 53: "ipsum"
               RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,60) size 262x30
-            RenderTableCell {TD} at (0,60) size 131x30 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,60) size 263x30
+            RenderTableCell {TD} at (0,60) size 132x30 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (2,3) size 69x25
                 text run at (2,3) width 69: "Lore\x{300}m "
               RenderInline {SPAN} at (0,0) size 48x23
                 RenderText {#text} at (71,5) size 48x23
                   text run at (71,5) width 48: "ipsu\x{308}m"
               RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (131,60) size 131x30 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (132,60) size 131x30 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (2,3) size 69x25
                 text run at (2,3) width 69: "Lorem "
               RenderInline {SPAN} at (0,0) size 48x23
                 RenderText {#text} at (71,5) size 48x23
                   text run at (71,5) width 48: "ipsum"
               RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,90) size 262x30
-            RenderTableCell {TD} at (0,90) size 131x30 [border: (1px solid #008000)] [r=3 c=0 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 75x25
-                text run at (2,3) width 75: "Lore\x{300}m "
+          RenderTableRow {TR} at (0,90) size 263x30
+            RenderTableCell {TD} at (0,90) size 132x30 [border: (1px solid #008000)] [r=3 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 76x25
+                text run at (2,3) width 76: "Lore\x{300}m "
               RenderInline {SPAN} at (0,0) size 51x23
-                RenderText {#text} at (77,5) size 51x23
-                  text run at (77,5) width 51: "ipsu\x{308}m"
+                RenderText {#text} at (78,5) size 51x23
+                  text run at (78,5) width 51: "ipsu\x{308}m"
               RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (131,90) size 131x30 [border: (1px solid #008000)] [r=3 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (132,90) size 131x30 [border: (1px solid #008000)] [r=3 c=1 rs=1 cs=1]
               RenderText {#text} at (2,3) size 75x25
                 text run at (2,3) width 75: "Lorem "
               RenderInline {SPAN} at (0,0) size 51x23
                 RenderText {#text} at (77,5) size 51x23
                   text run at (77,5) width 51: "ipsum"
               RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,120) size 262x26
-            RenderTableCell {TD} at (0,120) size 131x26 [border: (1px solid #008000)] [r=4 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,120) size 263x26
+            RenderTableCell {TD} at (0,120) size 132x26 [border: (1px solid #008000)] [r=4 c=0 rs=1 cs=1]
               RenderText {#text} at (2,2) size 100x23
                 text run at (2,2) width 100: "Lore\x{300}m ipsu\x{308}m"
-            RenderTableCell {TD} at (131,120) size 131x26 [border: (1px solid #008000)] [r=4 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (132,120) size 131x26 [border: (1px solid #008000)] [r=4 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 100x23
                 text run at (2,2) width 100: "Lorem ipsum"
       RenderBlock {HR} at (0,259) size 784x2 [border: (1px inset #000000)]
diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.checksum b/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.checksum
deleted file mode 100644 (file)
index 8d5043f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-132297127dc92a2e5d165da61ff832d7
\ No newline at end of file
diff --git a/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.png b/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.png
deleted file mode 100644 (file)
index 444eb9c..0000000
Binary files a/LayoutTests/platform/mac-snowleopard/fast/text/atsui-multiple-renderers-expected.png and /dev/null differ
index 0b7242c..3f1e80c 100644 (file)
@@ -29,3 +29,11 @@ editing/deleting/skip-virama-001.html
 # Prior to Unicode 5 some Thai combining marks had line breaking property
 # CM instead of SA
 platform/mac/editing/selection/word-thai.html
+
+# Tests of table accessibility functionality not supported on Tiger
+platform/mac/accessibility/table-multi-bodies.html
+platform/mac/accessibility/table-updating.html
+
+# Tests of font features not supported by ATSUI
+platform/mac/fast/text/myanmar-shaping.html
+platform/mac/fast/text/thai-combining-mark-positioning.html
index c22231c..444eb9c 100644 (file)
Binary files a/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.png and b/LayoutTests/platform/mac/fast/text/atsui-multiple-renderers-expected.png differ
index 7c7a5de..6d6031e 100644 (file)
@@ -16,73 +16,73 @@ layer at (0,0) size 800x600
       RenderBlock {P} at (0,70) size 784x18
         RenderText {#text} at (0,0) size 600x18
           text run at (0,0) width 600: "The two columns should be identical except for the accent over the e and the umlaut over the u."
-      RenderTable {TABLE} at (0,104) size 264x147 [border: none]
-        RenderTableSection {TBODY} at (0,0) size 263x146
-          RenderTableRow {TR} at (0,0) size 263x30
-            RenderTableCell {TD} at (0,0) size 132x30 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1]
+      RenderTable {TABLE} at (0,104) size 263x147 [border: none]
+        RenderTableSection {TBODY} at (0,0) size 262x146
+          RenderTableRow {TR} at (0,0) size 262x30
+            RenderTableCell {TD} at (0,0) size 131x30 [border: (1px solid #008000)] [r=0 c=0 rs=1 cs=1]
               RenderText {#text} at (2,3) size 69x25
                 text run at (2,3) width 69: "Lore\x{300}m "
               RenderInline {SPAN} at (0,0) size 50x23
                 RenderText {#text} at (71,5) size 50x23
                   text run at (71,5) width 50: "ipsu\x{308}m"
               RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (132,0) size 131x30 [border: (1px solid #008000)] [r=0 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (131,0) size 131x30 [border: (1px solid #008000)] [r=0 c=1 rs=1 cs=1]
               RenderText {#text} at (2,3) size 69x25
                 text run at (2,3) width 69: "Lorem "
               RenderInline {SPAN} at (0,0) size 50x23
                 RenderText {#text} at (71,5) size 50x23
                   text run at (71,5) width 50: "ipsum"
               RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,30) size 263x30
-            RenderTableCell {TD} at (0,30) size 132x30 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 76x25
-                text run at (2,3) width 76: "Lore\x{300}m "
+          RenderTableRow {TR} at (0,30) size 262x30
+            RenderTableCell {TD} at (0,30) size 131x30 [border: (1px solid #008000)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 75x25
+                text run at (2,3) width 75: "Lore\x{300}m "
               RenderInline {SPAN} at (0,0) size 53x23
-                RenderText {#text} at (78,5) size 53x23
-                  text run at (78,5) width 53: "ipsu\x{308}m"
+                RenderText {#text} at (77,5) size 53x23
+                  text run at (77,5) width 53: "ipsu\x{308}m"
               RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (132,30) size 131x30 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (131,30) size 131x30 [border: (1px solid #008000)] [r=1 c=1 rs=1 cs=1]
               RenderText {#text} at (2,3) size 75x25
                 text run at (2,3) width 75: "Lorem "
               RenderInline {SPAN} at (0,0) size 53x23
                 RenderText {#text} at (77,5) size 53x23
                   text run at (77,5) width 53: "ipsum"
               RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,60) size 263x30
-            RenderTableCell {TD} at (0,60) size 132x30 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,60) size 262x30
+            RenderTableCell {TD} at (0,60) size 131x30 [border: (1px solid #008000)] [r=2 c=0 rs=1 cs=1]
               RenderText {#text} at (2,3) size 69x25
                 text run at (2,3) width 69: "Lore\x{300}m "
               RenderInline {SPAN} at (0,0) size 48x23
                 RenderText {#text} at (71,5) size 48x23
                   text run at (71,5) width 48: "ipsu\x{308}m"
               RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (132,60) size 131x30 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (131,60) size 131x30 [border: (1px solid #008000)] [r=2 c=1 rs=1 cs=1]
               RenderText {#text} at (2,3) size 69x25
                 text run at (2,3) width 69: "Lorem "
               RenderInline {SPAN} at (0,0) size 48x23
                 RenderText {#text} at (71,5) size 48x23
                   text run at (71,5) width 48: "ipsum"
               RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,90) size 263x30
-            RenderTableCell {TD} at (0,90) size 132x30 [border: (1px solid #008000)] [r=3 c=0 rs=1 cs=1]
-              RenderText {#text} at (2,3) size 76x25
-                text run at (2,3) width 76: "Lore\x{300}m "
+          RenderTableRow {TR} at (0,90) size 262x30
+            RenderTableCell {TD} at (0,90) size 131x30 [border: (1px solid #008000)] [r=3 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,3) size 75x25
+                text run at (2,3) width 75: "Lore\x{300}m "
               RenderInline {SPAN} at (0,0) size 51x23
-                RenderText {#text} at (78,5) size 51x23
-                  text run at (78,5) width 51: "ipsu\x{308}m"
+                RenderText {#text} at (77,5) size 51x23
+                  text run at (77,5) width 51: "ipsu\x{308}m"
               RenderText {#text} at (0,0) size 0x0
-            RenderTableCell {TD} at (132,90) size 131x30 [border: (1px solid #008000)] [r=3 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (131,90) size 131x30 [border: (1px solid #008000)] [r=3 c=1 rs=1 cs=1]
               RenderText {#text} at (2,3) size 75x25
                 text run at (2,3) width 75: "Lorem "
               RenderInline {SPAN} at (0,0) size 51x23
                 RenderText {#text} at (77,5) size 51x23
                   text run at (77,5) width 51: "ipsum"
               RenderText {#text} at (0,0) size 0x0
-          RenderTableRow {TR} at (0,120) size 263x26
-            RenderTableCell {TD} at (0,120) size 132x26 [border: (1px solid #008000)] [r=4 c=0 rs=1 cs=1]
+          RenderTableRow {TR} at (0,120) size 262x26
+            RenderTableCell {TD} at (0,120) size 131x26 [border: (1px solid #008000)] [r=4 c=0 rs=1 cs=1]
               RenderText {#text} at (2,2) size 100x23
                 text run at (2,2) width 100: "Lore\x{300}m ipsu\x{308}m"
-            RenderTableCell {TD} at (132,120) size 131x26 [border: (1px solid #008000)] [r=4 c=1 rs=1 cs=1]
+            RenderTableCell {TD} at (131,120) size 131x26 [border: (1px solid #008000)] [r=4 c=1 rs=1 cs=1]
               RenderText {#text} at (2,2) size 100x23
                 text run at (2,2) width 100: "Lorem ipsum"
       RenderBlock {HR} at (0,259) size 784x2 [border: (1px inset #000000)]
index 21154f5..e58bfcd 100644 (file)
@@ -1,3 +1,18 @@
+2009-03-14  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Change the layout test result search policy for Mac OS X to fit better with the idea of
+        newer OS versions improving on previous OS versions.
+
+        The results for the latest version of Mac OS X are placed in the "mac" directory.  The
+        results for older versions of Mac OS X are structured as a series of overlays.  When
+        running on Leopard, the results in "mac-leopard" are searched before those in "mac".
+        When running on Tiger, the results in "mac-tiger" are searched before those in
+        "mac-leopard" and "mac".
+
+        * Scripts/run-webkit-tests:
+
 2009-03-13  Mark Rowe  <mrowe@apple.com>
 
         Rubber-stamped by Dan Bernstein.
index 0435b57..26ae277 100755 (executable)
@@ -142,6 +142,8 @@ my $actualTag = "actual";
 my $diffsTag = "diffs";
 my $errorTag = "stderr";
 
+my @macPlatforms = ("mac-tiger", "mac-leopard", "mac-snowleopard", "mac");
+
 if (isTiger()) {
     $platform = "mac-tiger";
     $tolerance = 1.0;
@@ -1705,10 +1707,22 @@ sub buildPlatformHierarchy()
 {
     mkpath($platformTestDirectory) if ($platform eq "undefined" && !-d "$platformTestDirectory");
 
-    my @platforms = split('-', $platform);
+    my @platforms;
+    if ($platform =~ /^mac-/) {
+        my $i;
+        for ($i = 0; $i < @macPlatforms; $i++) {
+            last if $macPlatforms[$i] eq $platform;
+        }
+        for (; $i < @macPlatforms; $i++) {
+            push @platforms, $macPlatforms[$i];
+        }
+    } else {
+        @platforms = $platform;
+    }
+
     my @hierarchy;
-    for (my $i=0; $i < @platforms; $i++) {
-        my $scoped = catdir($platformBaseDirectory, join('-', @platforms[0..($#platforms - $i)]));
+    for (my $i = 0; $i < @platforms; $i++) {
+        my $scoped = catdir($platformBaseDirectory, $platforms[$i]);
         push(@hierarchy, $scoped) if (-d $scoped);
     }