From ae6585da882df7c1b08cb6e860d727b2e61a0d8e Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sat, 28 Nov 2015 19:20:18 +0100 Subject: [PATCH] Move overconstrained_block.html to wpt reftests. --- tests/ref/basic.list | 2 -- tests/wpt/mozilla/meta/MANIFEST.json | 24 +++++++++++++++++++ .../tests/css}/overconstrained_block.html | 1 + .../tests/css}/overconstrained_block_ref.html | 9 +++---- 4 files changed, 30 insertions(+), 6 deletions(-) rename tests/{ref => wpt/mozilla/tests/css}/overconstrained_block.html (90%) rename tests/{ref => wpt/mozilla/tests/css}/overconstrained_block_ref.html (54%) 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 similarity index 90% rename from tests/ref/overconstrained_block.html rename to 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 @@ Block with over-contrained margins+borders+padding+width = containing block width + -

-

-

-

+

+

+

+ +