From 6d5da817e8bd7ccc2d4b8a0c328a51a93f3e0c2e Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 16 Oct 2015 12:30:38 +0200 Subject: [PATCH 1/6] Move block_image.html to wpt reftests. --- tests/ref/basic.list | 2 -- tests/wpt/mozilla/meta/MANIFEST.json | 32 ++++++++++++++++++ tests/wpt/mozilla/tests/css/400x400_green.png | Bin 0 -> 1053 bytes .../mozilla/tests/css}/500x300_green.html | 0 .../mozilla/tests/css}/block_image.html | 2 ++ .../tests/css}/noteq_500x300_white.html | 0 6 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 tests/wpt/mozilla/tests/css/400x400_green.png rename tests/{ref => wpt/mozilla/tests/css}/500x300_green.html (100%) rename tests/{ref => wpt/mozilla/tests/css}/block_image.html (60%) rename tests/{ref => wpt/mozilla/tests/css}/noteq_500x300_white.html (100%) diff --git a/tests/ref/basic.list b/tests/ref/basic.list index d274da12d91..2d9dc3683fe 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -12,8 +12,6 @@ fragment=top != ../html/acid2.html acid2_ref.html == acid1_a.html acid1_b.html == acid2_noscroll.html acid2_ref_broken.html flaky_cpu == append_style_a.html append_style_b.html -== block_image.html 500x300_green.html -!= block_image.html noteq_500x300_white.html == block_replaced_content_a.html block_replaced_content_ref.html == block_replaced_content_b.html block_replaced_content_ref.html != blur_a.html blur_ref.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index e5b39863e76..f6f4bac0810 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -555,6 +555,22 @@ "url": "/_mozilla/css/block_formatting_context_with_margin_a.html" } ], + "css/block_image.html": [ + { + "path": "css/block_image.html", + "references": [ + [ + "/_mozilla/css/500x300_green.html", + "==" + ], + [ + "/_mozilla/css/noteq_500x300_white.html", + "!=" + ] + ], + "url": "/_mozilla/css/block_image.html" + } + ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", @@ -2636,6 +2652,22 @@ "url": "/_mozilla/css/block_formatting_context_with_margin_a.html" } ], + "css/block_image.html": [ + { + "path": "css/block_image.html", + "references": [ + [ + "/_mozilla/css/500x300_green.html", + "==" + ], + [ + "/_mozilla/css/noteq_500x300_white.html", + "!=" + ] + ], + "url": "/_mozilla/css/block_image.html" + } + ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", diff --git a/tests/wpt/mozilla/tests/css/400x400_green.png b/tests/wpt/mozilla/tests/css/400x400_green.png new file mode 100644 index 0000000000000000000000000000000000000000..484469eb140b190b8cf7ed507212c60d5e6e663b GIT binary patch literal 1053 zcmeAS@N?(olHy`uVBq!ia0y~yV4MKL985qF{<{ljGcYhe@pN$vskrs_iXkrp0|(1S z_W$!7S(!bxAGWRbVTjA%WH`)ZpmSgY0}nTl0I`7tn9aitW)mYxv_iaAjGBTy=!a3b s@OU$UlNyCyA~k(tPjzopr00;*iy8r+H literal 0 HcmV?d00001 diff --git a/tests/ref/500x300_green.html b/tests/wpt/mozilla/tests/css/500x300_green.html similarity index 100% rename from tests/ref/500x300_green.html rename to tests/wpt/mozilla/tests/css/500x300_green.html diff --git a/tests/ref/block_image.html b/tests/wpt/mozilla/tests/css/block_image.html similarity index 60% rename from tests/ref/block_image.html rename to tests/wpt/mozilla/tests/css/block_image.html index cf262775a41..7bba4554786 100644 --- a/tests/ref/block_image.html +++ b/tests/wpt/mozilla/tests/css/block_image.html @@ -1,4 +1,6 @@ + + diff --git a/tests/ref/noteq_500x300_white.html b/tests/wpt/mozilla/tests/css/noteq_500x300_white.html similarity index 100% rename from tests/ref/noteq_500x300_white.html rename to tests/wpt/mozilla/tests/css/noteq_500x300_white.html From cd9fc225f59badd0b134ad3fa520f5b0008147ca Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Fri, 16 Oct 2015 12:37:02 +0200 Subject: [PATCH 2/6] Move block_replaced_content_{a,b}.html to wpt reftests. --- tests/ref/basic.list | 2 - tests/wpt/mozilla/meta/MANIFEST.json | 48 +++++++++++++++++++ .../tests/css}/block_replaced_content_a.html | 1 + .../tests/css}/block_replaced_content_b.html | 1 + .../css}/block_replaced_content_ref.html | 0 5 files changed, 50 insertions(+), 2 deletions(-) rename tests/{ref => wpt/mozilla/tests/css}/block_replaced_content_a.html (84%) rename tests/{ref => wpt/mozilla/tests/css}/block_replaced_content_b.html (84%) rename tests/{ref => wpt/mozilla/tests/css}/block_replaced_content_ref.html (100%) diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 2d9dc3683fe..69459749195 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -12,8 +12,6 @@ fragment=top != ../html/acid2.html acid2_ref.html == acid1_a.html acid1_b.html == acid2_noscroll.html acid2_ref_broken.html flaky_cpu == append_style_a.html append_style_b.html -== block_replaced_content_a.html block_replaced_content_ref.html -== block_replaced_content_b.html block_replaced_content_ref.html != blur_a.html blur_ref.html != border_black_groove.html border_black_solid.html != border_black_ridge.html border_black_groove.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index f6f4bac0810..211d47e60de 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -571,6 +571,30 @@ "url": "/_mozilla/css/block_image.html" } ], + "css/block_replaced_content_a.html": [ + { + "path": "css/block_replaced_content_a.html", + "references": [ + [ + "/_mozilla/css/block_replaced_content_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/block_replaced_content_a.html" + } + ], + "css/block_replaced_content_b.html": [ + { + "path": "css/block_replaced_content_b.html", + "references": [ + [ + "/_mozilla/css/block_replaced_content_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/block_replaced_content_b.html" + } + ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", @@ -2668,6 +2692,30 @@ "url": "/_mozilla/css/block_image.html" } ], + "css/block_replaced_content_a.html": [ + { + "path": "css/block_replaced_content_a.html", + "references": [ + [ + "/_mozilla/css/block_replaced_content_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/block_replaced_content_a.html" + } + ], + "css/block_replaced_content_b.html": [ + { + "path": "css/block_replaced_content_b.html", + "references": [ + [ + "/_mozilla/css/block_replaced_content_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/block_replaced_content_b.html" + } + ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", diff --git a/tests/ref/block_replaced_content_a.html b/tests/wpt/mozilla/tests/css/block_replaced_content_a.html similarity index 84% rename from tests/ref/block_replaced_content_a.html rename to tests/wpt/mozilla/tests/css/block_replaced_content_a.html index 24dd273c908..639da0036a0 100644 --- a/tests/ref/block_replaced_content_a.html +++ b/tests/wpt/mozilla/tests/css/block_replaced_content_a.html @@ -1,6 +1,7 @@ +