Diff
Modified: trunk/LayoutTests/ChangeLog (111436 => 111437)
--- trunk/LayoutTests/ChangeLog 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/ChangeLog 2012-03-20 21:19:31 UTC (rev 111437)
@@ -1,5 +1,33 @@
2012-03-20 Dan Bernstein <[email protected]>
+ Work around the inconsistency in test results caused by <http://webkit.org/b/81696> in a few
+ tests, by appending a # character to the href attributes of links to other tests. This
+ ensures that they are never visited.
+
+ * fast/block/margin-collapse/001.html:
+ * fast/block/margin-collapse/005.html:
+ * fast/block/margin-collapse/010.html:
+ * fast/block/margin-collapse/011.html:
+ * fast/block/margin-collapse/012.html:
+ * fast/block/margin-collapse/015.html:
+ * fast/block/margin-collapse/016.html:
+ * fast/block/margin-collapse/017.html:
+ * fast/block/margin-collapse/020.html:
+ * fast/block/margin-collapse/056.html:
+ * fast/block/margin-collapse/059.html:
+ * fast/block/margin-collapse/block-inside-inline/001.html:
+ * fast/block/margin-collapse/block-inside-inline/005.html:
+ * fast/block/margin-collapse/block-inside-inline/010.html:
+ * fast/block/margin-collapse/block-inside-inline/011.html:
+ * fast/block/margin-collapse/block-inside-inline/012.html:
+ * fast/block/margin-collapse/block-inside-inline/015.html:
+ * fast/block/margin-collapse/block-inside-inline/016.html:
+ * fast/block/margin-collapse/block-inside-inline/017.html:
+ * fast/block/margin-collapse/block-inside-inline/020.html:
+ * platform/mac/fast/block/margin-collapse/056-expected.txt:
+
+2012-03-20 Dan Bernstein <[email protected]>
+
Added Mac WebKit2 expected results for this test. <http://webkit.org/b/81679> tracks the
difference in results between WebKit1 and WebKit2 in this test.
Modified: trunk/LayoutTests/fast/block/margin-collapse/001.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/001.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/001.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -35,6 +35,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/005.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/005.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/005.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -36,6 +36,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/010.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/010.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/010.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -51,6 +51,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/011.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/011.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/011.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -52,6 +52,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/012.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/012.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/012.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -34,6 +34,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/015.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/015.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/015.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -38,6 +38,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/016.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/016.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/016.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -40,6 +40,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/017.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/017.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/017.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -30,6 +30,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 018</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 018</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/020.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/020.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/020.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -46,6 +46,6 @@
</td>
</tr>
</table>
- <p>See also: <a href=""
+ <p>See also: <a href=""
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/056.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/056.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/056.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -33,6 +33,6 @@
</td>
</tr>
</table>
- <p>See also <a href="" 019</a>, <a href="" 020</a>.</p>
+ <p>See also <a href="" 019</a>, <a href="" 020</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/059.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/059.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/059.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -36,6 +36,6 @@
</td>
</tr>
</table>
- <p>This test is irrelevant if you don't pass <a href="" 056</a>.</p>
+ <p>This test is irrelevant if you don't pass <a href="" 056</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/001.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/001.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/001.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -35,6 +35,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/005.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/005.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/005.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -36,6 +36,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/010.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/010.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/010.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -51,6 +51,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/011.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/011.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/011.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -52,6 +52,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/012.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/012.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/012.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -34,6 +34,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/015.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/015.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/015.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -38,6 +38,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/016.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/016.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/016.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -40,6 +40,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 006</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/017.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/017.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/017.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -30,6 +30,6 @@
</td>
</tr>
</table>
- <p>This test is meaningless if you don't pass <a href="" 018</a>.</p>
+ <p>This test is meaningless if you don't pass <a href="" 018</a>.</p>
</body>
</html>
Modified: trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/020.html (111436 => 111437)
--- trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/020.html 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/fast/block/margin-collapse/block-inside-inline/020.html 2012-03-20 21:19:31 UTC (rev 111437)
@@ -46,6 +46,6 @@
</td>
</tr>
</table>
- <p>See also: <a href=""
+ <p>See also: <a href=""
</body>
</html>
Modified: trunk/LayoutTests/platform/mac/fast/block/margin-collapse/056-expected.txt (111436 => 111437)
--- trunk/LayoutTests/platform/mac/fast/block/margin-collapse/056-expected.txt 2012-03-20 21:05:32 UTC (rev 111436)
+++ trunk/LayoutTests/platform/mac/fast/block/margin-collapse/056-expected.txt 2012-03-20 21:19:31 UTC (rev 111437)
@@ -25,7 +25,7 @@
text run at (56,0) width 49: "test 019"
RenderText {#text} at (105,0) size 8x18
text run at (105,0) width 8: ", "
- RenderInline {A} at (0,0) size 49x18 [color=#551A8B]
+ RenderInline {A} at (0,0) size 49x18 [color=#0000EE]
RenderText {#text} at (113,0) size 49x18
text run at (113,0) width 49: "test 020"
RenderText {#text} at (162,0) size 4x18
