From f7db33eb3363b9404d7cf9de8a7e7e2ec0205ba3 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Tue, 12 Jan 2016 15:17:16 +0100 Subject: [PATCH 1/3] Move acid2.html to wpt reftests. --- tests/ref/basic.list | 3 - tests/wpt/mozilla/meta/MANIFEST.json | 50 ++++++ .../mozilla/meta/css/acid2-wrapper.html.ini | 3 + tests/wpt/mozilla/meta/css/acid2_ref.html.ini | 3 + .../wpt/mozilla/tests/css/acid2-wrapper.html | 15 ++ tests/wpt/mozilla/tests/css/acid2.html | 150 ++++++++++++++++++ .../mozilla/tests/css}/acid2_ref.html | 1 + tests/wpt/mozilla/tests/css/acid2_ref.png | Bin 0 -> 2261 bytes 8 files changed, 222 insertions(+), 3 deletions(-) create mode 100644 tests/wpt/mozilla/meta/css/acid2-wrapper.html.ini create mode 100644 tests/wpt/mozilla/meta/css/acid2_ref.html.ini create mode 100644 tests/wpt/mozilla/tests/css/acid2-wrapper.html create mode 100755 tests/wpt/mozilla/tests/css/acid2.html rename tests/{ref => wpt/mozilla/tests/css}/acid2_ref.html (94%) create mode 100644 tests/wpt/mozilla/tests/css/acid2_ref.png diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 4ee563b6c09..65bd9b5803f 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -1,8 +1,5 @@ # This file must be sorted alphabetically. # Please run `./mach test-tidy` to check your changes. -# Should be == with expected failure: -fragment=top != ../html/acid2.html acid2_ref.html - # This file must be sorted alphabetically. # Please run `./mach test-tidy` to check your changes. diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index d6fc30b6a8f..44620f9b226 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -151,6 +151,19 @@ "url": "/_mozilla/css/acid1_a.html" } ], + "css/acid2-wrapper.html": [ + { + "path": "css/acid2-wrapper.html", + "references": [ + [ + "/_mozilla/css/acid2_ref_broken.html", + "==" + ] + ], + "timeout": "long", + "url": "/_mozilla/css/acid2-wrapper.html" + } + ], "css/acid2_noscroll.html": [ { "path": "css/acid2_noscroll.html", @@ -163,6 +176,18 @@ "url": "/_mozilla/css/acid2_noscroll.html" } ], + "css/acid2_ref.html": [ + { + "path": "css/acid2_ref.html", + "references": [ + [ + "/_mozilla/css/acid2_ref_broken.html", + "==" + ] + ], + "url": "/_mozilla/css/acid2_ref.html" + } + ], "css/after_block_iteration.html": [ { "path": "css/after_block_iteration.html", @@ -6194,6 +6219,19 @@ "url": "/_mozilla/css/acid1_a.html" } ], + "css/acid2-wrapper.html": [ + { + "path": "css/acid2-wrapper.html", + "references": [ + [ + "/_mozilla/css/acid2_ref_broken.html", + "==" + ] + ], + "timeout": "long", + "url": "/_mozilla/css/acid2-wrapper.html" + } + ], "css/acid2_noscroll.html": [ { "path": "css/acid2_noscroll.html", @@ -6206,6 +6244,18 @@ "url": "/_mozilla/css/acid2_noscroll.html" } ], + "css/acid2_ref.html": [ + { + "path": "css/acid2_ref.html", + "references": [ + [ + "/_mozilla/css/acid2_ref_broken.html", + "==" + ] + ], + "url": "/_mozilla/css/acid2_ref.html" + } + ], "css/after_block_iteration.html": [ { "path": "css/after_block_iteration.html", diff --git a/tests/wpt/mozilla/meta/css/acid2-wrapper.html.ini b/tests/wpt/mozilla/meta/css/acid2-wrapper.html.ini new file mode 100644 index 00000000000..f2657877a44 --- /dev/null +++ b/tests/wpt/mozilla/meta/css/acid2-wrapper.html.ini @@ -0,0 +1,3 @@ +[acid2-wrapper.html] + type: reftest + disabled: https://github.com/servo/servo/issues/9310 diff --git a/tests/wpt/mozilla/meta/css/acid2_ref.html.ini b/tests/wpt/mozilla/meta/css/acid2_ref.html.ini new file mode 100644 index 00000000000..55dd5ca27f3 --- /dev/null +++ b/tests/wpt/mozilla/meta/css/acid2_ref.html.ini @@ -0,0 +1,3 @@ +[acid2_ref.html] + type: reftest + expected: FAIL diff --git a/tests/wpt/mozilla/tests/css/acid2-wrapper.html b/tests/wpt/mozilla/tests/css/acid2-wrapper.html new file mode 100644 index 00000000000..d1907a92b64 --- /dev/null +++ b/tests/wpt/mozilla/tests/css/acid2-wrapper.html @@ -0,0 +1,15 @@ + + + + + + diff --git a/tests/wpt/mozilla/tests/css/acid2.html b/tests/wpt/mozilla/tests/css/acid2.html new file mode 100755 index 00000000000..2f700b14e71 --- /dev/null +++ b/tests/wpt/mozilla/tests/css/acid2.html @@ -0,0 +1,150 @@ + + + + The Second Acid Test + + + + +
+

Standards compliant?

+

Take The Acid2 Test and compare it to the reference rendering.

+
+

Hello World!

+
+

+

+
                              
+
ERROR
+
+
+
+
 
+
+ +
+
+ + + diff --git a/tests/ref/acid2_ref.html b/tests/wpt/mozilla/tests/css/acid2_ref.html similarity index 94% rename from tests/ref/acid2_ref.html rename to tests/wpt/mozilla/tests/css/acid2_ref.html index a6cc0c01b28..d0b4e28ec3e 100644 --- a/tests/ref/acid2_ref.html +++ b/tests/wpt/mozilla/tests/css/acid2_ref.html @@ -2,6 +2,7 @@ The Second Acid Test (Reference Rendering) +