From d735d12ebd89ab0dc1743c3c5c18bc8ffc9a59b2 Mon Sep 17 00:00:00 2001 From: Corey Farwell Date: Fri, 16 Oct 2015 08:21:11 -0400 Subject: [PATCH] Move root_margin_collapse_a.html to wpt reftests. --- tests/ref/basic.list | 1 - tests/wpt/mozilla/meta/MANIFEST.json | 24 +++++++++++++++++++ .../tests/css}/root_margin_collapse_a.html | 1 + .../tests/css}/root_margin_collapse_b.html | 0 4 files changed, 25 insertions(+), 1 deletion(-) rename tests/{ref => wpt/mozilla/tests/css}/root_margin_collapse_a.html (74%) rename tests/{ref => wpt/mozilla/tests/css}/root_margin_collapse_b.html (100%) diff --git a/tests/ref/basic.list b/tests/ref/basic.list index bf7eb48440e..6c10202c6bf 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -279,7 +279,6 @@ resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_ == root_display_inline_a.html root_display_ref.html == root_display_without_style_a.html root_display_ref.html == root_height_a.html root_height_b.html -== root_margin_collapse_a.html root_margin_collapse_b.html # text_decoration_propagation_a.html text_decoration_propagation_b.html != text_decoration_smoke_a.html text_decoration_smoke_ref.html != text_decoration_underline_subpx_a.html text_decoration_underline_subpx_ref.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 2308445add3..3002ffc6384 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -683,6 +683,18 @@ "url": "/_mozilla/css/flex_nochild.html" } ], + "css/root_margin_collapse_a.html": [ + { + "path": "css/root_margin_collapse_a.html", + "references": [ + [ + "/_mozilla/css/root_margin_collapse_b.html", + "==" + ] + ], + "url": "/_mozilla/css/root_margin_collapse_a.html" + } + ], "css/root_pseudo_a.html": [ { "path": "css/root_pseudo_a.html", @@ -2940,6 +2952,18 @@ "url": "/_mozilla/css/flex_nochild.html" } ], + "css/root_margin_collapse_a.html": [ + { + "path": "css/root_margin_collapse_a.html", + "references": [ + [ + "/_mozilla/css/root_margin_collapse_b.html", + "==" + ] + ], + "url": "/_mozilla/css/root_margin_collapse_a.html" + } + ], "css/root_pseudo_a.html": [ { "path": "css/root_pseudo_a.html", diff --git a/tests/ref/root_margin_collapse_a.html b/tests/wpt/mozilla/tests/css/root_margin_collapse_a.html similarity index 74% rename from tests/ref/root_margin_collapse_a.html rename to tests/wpt/mozilla/tests/css/root_margin_collapse_a.html index a3c98252be0..78b0662e571 100644 --- a/tests/ref/root_margin_collapse_a.html +++ b/tests/wpt/mozilla/tests/css/root_margin_collapse_a.html @@ -1,4 +1,5 @@ +
diff --git a/tests/ref/root_margin_collapse_b.html b/tests/wpt/mozilla/tests/css/root_margin_collapse_b.html similarity index 100% rename from tests/ref/root_margin_collapse_b.html rename to tests/wpt/mozilla/tests/css/root_margin_collapse_b.html