From 82183aebd7368dd0178d943d260f119102ac4f9b Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 7 Dec 2015 14:59:36 -0500 Subject: [PATCH 1/3] Move acid2_noscroll.html to wpt reftests. --- tests/ref/basic.list | 6 ----- tests/wpt/mozilla/meta/MANIFEST.json | 24 ++++++++++++++++++ .../mozilla/tests/css}/acid2_noscroll.html | 1 + .../mozilla/tests/css}/acid2_ref_broken.html | 0 .../mozilla/tests/css}/acid2_ref_broken.png | Bin 5 files changed, 25 insertions(+), 6 deletions(-) rename tests/{ref => wpt/mozilla/tests/css}/acid2_noscroll.html (99%) rename tests/{ref => wpt/mozilla/tests/css}/acid2_ref_broken.html (100%) rename tests/{ref => wpt/mozilla/tests/css}/acid2_ref_broken.png (100%) diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 68a81c1b76d..9b30eea754f 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -1,15 +1,9 @@ # This file must be sorted alphabetically. # Please run `./mach test-tidy` to check your changes. - -# Should be != with expected failure: -# FIXME: use the real test when pixel-snapping for scrolling is fixed. -#fragment=top == ../html/acid2.html acid2_ref_broken.html - # Should be == with expected failure: fragment=top != ../html/acid2.html acid2_ref.html -== acid2_noscroll.html acid2_ref_broken.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 diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index cdb4e4b59ae..ae7c3f4e3ba 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -151,6 +151,18 @@ "url": "/_mozilla/css/acid1_a.html" } ], + "css/acid2_noscroll.html": [ + { + "path": "css/acid2_noscroll.html", + "references": [ + [ + "/_mozilla/css/acid2_ref_broken.html", + "==" + ] + ], + "url": "/_mozilla/css/acid2_noscroll.html" + } + ], "css/after_block_iteration.html": [ { "path": "css/after_block_iteration.html", @@ -5982,6 +5994,18 @@ "url": "/_mozilla/css/acid1_a.html" } ], + "css/acid2_noscroll.html": [ + { + "path": "css/acid2_noscroll.html", + "references": [ + [ + "/_mozilla/css/acid2_ref_broken.html", + "==" + ] + ], + "url": "/_mozilla/css/acid2_noscroll.html" + } + ], "css/after_block_iteration.html": [ { "path": "css/after_block_iteration.html", diff --git a/tests/ref/acid2_noscroll.html b/tests/wpt/mozilla/tests/css/acid2_noscroll.html similarity index 99% rename from tests/ref/acid2_noscroll.html rename to tests/wpt/mozilla/tests/css/acid2_noscroll.html index 9dc184e9ee5..0af3ae3c263 100755 --- a/tests/ref/acid2_noscroll.html +++ b/tests/wpt/mozilla/tests/css/acid2_noscroll.html @@ -2,6 +2,7 @@ The Second Acid Test +