diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2015-11-28 19:20:18 +0100 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2015-11-29 10:57:16 +0100 |
| commit | ae6585da882df7c1b08cb6e860d727b2e61a0d8e (patch) | |
| tree | d177bc6a5c4edd28634aa4841ca6f957f77a69f5 | |
| parent | facee849c2e3a3280a918012aadb3c6d0b646873 (diff) | |
| download | servo-ae6585da882df7c1b08cb6e860d727b2e61a0d8e.tar.gz servo-ae6585da882df7c1b08cb6e860d727b2e61a0d8e.zip | |
Move overconstrained_block.html to wpt reftests.
| -rw-r--r-- | tests/ref/basic.list | 2 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/MANIFEST.json | 24 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/css/overconstrained_block.html (renamed from tests/ref/overconstrained_block.html) | 1 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/css/overconstrained_block_ref.html (renamed from tests/ref/overconstrained_block_ref.html) | 9 |
4 files changed, 30 insertions, 6 deletions
diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 838dd1e670e..fd5d92ec839 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -13,8 +13,6 @@ fragment=top != ../html/acid2.html acid2_ref.html flaky_cpu == append_style_a.html append_style_b.html # `?` and `#` in the name is a test for https://github.com/servo/servo/issues/3340 -# Should be == with expected failure. See #2797 -!= overconstrained_block.html overconstrained_block_ref.html # Should be ==? != overflow_position_abs_inside_normal_a.html overflow_position_abs_inside_normal_b.html resolution=300x300,device-pixel-ratio=2 != pixel_snapping_border_a.html pixel_snapping_border_ref.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index e8e11e66207..e2b7aa33d2d 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -3247,6 +3247,18 @@ "url": "/_mozilla/css/outset_blackborder.html" } ], + "css/overconstrained_block.html": [ + { + "path": "css/overconstrained_block.html", + "references": [ + [ + "/_mozilla/css/overconstrained_block_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/overconstrained_block.html" + } + ], "css/overflow_auto.html": [ { "path": "css/overflow_auto.html", @@ -8958,6 +8970,18 @@ "url": "/_mozilla/css/outset_blackborder.html" } ], + "css/overconstrained_block.html": [ + { + "path": "css/overconstrained_block.html", + "references": [ + [ + "/_mozilla/css/overconstrained_block_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/overconstrained_block.html" + } + ], "css/overflow_auto.html": [ { "path": "css/overflow_auto.html", diff --git a/tests/ref/overconstrained_block.html b/tests/wpt/mozilla/tests/css/overconstrained_block.html index 83728b44652..3cad163dab5 100644 --- a/tests/ref/overconstrained_block.html +++ b/tests/wpt/mozilla/tests/css/overconstrained_block.html @@ -1,6 +1,7 @@ <html> <head> <title>Block with over-contrained margins+borders+padding+width = containing block width</title> + <link rel=match href=overconstrained_block_ref.html> <style> body { width: 300px; margin: 0 0 0 400px } div:nth-child(even) { direction: rtl } diff --git a/tests/ref/overconstrained_block_ref.html b/tests/wpt/mozilla/tests/css/overconstrained_block_ref.html index 12016be7cfe..a6662f08769 100644 --- a/tests/ref/overconstrained_block_ref.html +++ b/tests/wpt/mozilla/tests/css/overconstrained_block_ref.html @@ -7,9 +7,10 @@ </style> </head> <body> - <p style="top: 20px; left: 70px"></p> - <p style="top: 140px; left: 30px"></p> - <p style="top: 260px; left: 120px"></p> - <p style="top: 380px; left: -20px"></p> + <p style="top: 20px; left: 470px"></p> + <p style="top: 140px; left: 430px"></p> + <p style="top: 260px; left: 520px"></p> + <!-- https://github.com/servo/servo/issues/8721: should be left: 380px --> + <p style="top: 380px; left: 360px"></p> </body> </html> |