From c55b52b69d14984b9d626abd740e0fa89aa945e6 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 30 Apr 2015 17:43:34 +0200 Subject: [PATCH 1/2] Sort the css tests in our wptrunner manifest. --- tests/wpt/mozilla/meta/MANIFEST.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 1386dc24326..7e7da6e5544 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -536,18 +536,6 @@ } }, "reftest_nodes": { - "css/class-namespaces.html": [ - { - "path": "css/class-namespaces.html", - "references": [ - [ - "/_mozilla/css/class-namespaces-ref.html", - "==" - ] - ], - "url": "/_mozilla/css/class-namespaces.html" - } - ], "css/abs_float_pref_width.html": [ { "path": "css/abs_float_pref_width.html", @@ -559,6 +547,18 @@ ], "url": "/_mozilla/css/abs_float_pref_width.html" } + ], + "css/class-namespaces.html": [ + { + "path": "css/class-namespaces.html", + "references": [ + [ + "/_mozilla/css/class-namespaces-ref.html", + "==" + ] + ], + "url": "/_mozilla/css/class-namespaces.html" + } ] } }, From bbd7cac3719124de8f3f3a72bfac687c369e5a77 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 30 Apr 2015 17:44:39 +0200 Subject: [PATCH 2/2] Run absolute position reftests as part of test-wpt. --- tests/ref/basic.list | 3 - tests/wpt/mozilla/meta/MANIFEST.json | 74 ++++++++++++++++++- .../absolute_clipping_of_own_contents.html} | 1 + ...absolute_clipping_of_own_contents_ref.html | 0 .../tests/css/absolute_content_height.html} | 1 + .../css}/absolute_content_height_ref.html | 0 .../css/absolute_hypothetical_float.html} | 1 + .../css}/absolute_hypothetical_float_ref.html | 0 8 files changed, 76 insertions(+), 4 deletions(-) rename tests/{ref/absolute_clipping_of_own_contents_a.html => wpt/mozilla/tests/css/absolute_clipping_of_own_contents.html} (90%) rename tests/{ref => wpt/mozilla/tests/css}/absolute_clipping_of_own_contents_ref.html (100%) rename tests/{ref/absolute_content_height_a.html => wpt/mozilla/tests/css/absolute_content_height.html} (81%) rename tests/{ref => wpt/mozilla/tests/css}/absolute_content_height_ref.html (100%) rename tests/{ref/absolute_hypothetical_float_a.html => wpt/mozilla/tests/css/absolute_hypothetical_float.html} (80%) rename tests/{ref => wpt/mozilla/tests/css}/absolute_hypothetical_float_ref.html (100%) diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 7c343382004..2c012b8e3f0 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -38,9 +38,6 @@ fragment=top != ../html/acid2.html acid2_ref.html == 2dcontext/lineto_a.html 2dcontext/lineto_ref.html == 2dcontext/transform_a.html 2dcontext/transform_ref.html -== absolute_clipping_of_own_contents_a.html absolute_clipping_of_own_contents_ref.html -== absolute_content_height_a.html absolute_content_height_ref.html -== absolute_hypothetical_float_a.html absolute_hypothetical_float_ref.html == acid1_a.html acid1_b.html == acid2_noscroll.html acid2_ref_broken.html == after_block_iteration.html after_block_iteration_ref.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 7e7da6e5544..841aa8f1c5b 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -27,6 +27,42 @@ "url": "/_mozilla/css/abs_float_pref_width.html" } ], + "css/absolute_clipping_of_own_contents.html": [ + { + "path": "css/absolute_clipping_of_own_contents.html", + "references": [ + [ + "/_mozilla/css/absolute_clipping_of_own_contents_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/absolute_clipping_of_own_contents.html" + } + ], + "css/absolute_content_height.html": [ + { + "path": "css/absolute_content_height.html", + "references": [ + [ + "/_mozilla/css/absolute_content_height_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/absolute_content_height.html" + } + ], + "css/absolute_hypothetical_float.html": [ + { + "path": "css/absolute_hypothetical_float.html", + "references": [ + [ + "/_mozilla/css/absolute_hypothetical_float_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/absolute_hypothetical_float.html" + } + ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", @@ -548,6 +584,42 @@ "url": "/_mozilla/css/abs_float_pref_width.html" } ], + "css/absolute_clipping_of_own_contents.html": [ + { + "path": "css/absolute_clipping_of_own_contents.html", + "references": [ + [ + "/_mozilla/css/absolute_clipping_of_own_contents_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/absolute_clipping_of_own_contents.html" + } + ], + "css/absolute_content_height.html": [ + { + "path": "css/absolute_content_height.html", + "references": [ + [ + "/_mozilla/css/absolute_content_height_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/absolute_content_height.html" + } + ], + "css/absolute_hypothetical_float.html": [ + { + "path": "css/absolute_hypothetical_float.html", + "references": [ + [ + "/_mozilla/css/absolute_hypothetical_float_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/absolute_hypothetical_float.html" + } + ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", @@ -566,4 +638,4 @@ "rev": null, "url_base": "/_mozilla/", "version": 2 -} +} \ No newline at end of file diff --git a/tests/ref/absolute_clipping_of_own_contents_a.html b/tests/wpt/mozilla/tests/css/absolute_clipping_of_own_contents.html similarity index 90% rename from tests/ref/absolute_clipping_of_own_contents_a.html rename to tests/wpt/mozilla/tests/css/absolute_clipping_of_own_contents.html index b018d799a86..19919ff89c7 100644 --- a/tests/ref/absolute_clipping_of_own_contents_a.html +++ b/tests/wpt/mozilla/tests/css/absolute_clipping_of_own_contents.html @@ -2,6 +2,7 @@ +