From fab0aa2723ca71ac7f837de643210a5d26a65464 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Wed, 14 Oct 2015 08:37:42 +0200 Subject: [PATCH 01/10] Move block_formatting_context_a.html to wpt reftests. --- tests/ref/basic.list | 1 - tests/wpt/mozilla/meta/MANIFEST.json | 24 +++++++++++++++++++ .../css}/block_formatting_context_a.html | 1 + .../css/block_formatting_context_ref.html | 7 ++++++ 4 files changed, 32 insertions(+), 1 deletion(-) rename tests/{ref => wpt/mozilla/tests/css}/block_formatting_context_a.html (72%) create mode 100644 tests/wpt/mozilla/tests/css/block_formatting_context_ref.html diff --git a/tests/ref/basic.list b/tests/ref/basic.list index c3cdd1df6fa..e43bb8db203 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -12,7 +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_formatting_context_a.html block_formatting_context_ref.html == block_formatting_context_cleared_float_a.html block_formatting_context_cleared_float_ref.html == block_formatting_context_complex_a.html block_formatting_context_complex_ref.html == block_formatting_context_containing_floats_a.html block_formatting_context_containing_floats_ref.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index cca460351f1..72acbf4843b 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -435,6 +435,18 @@ "url": "/_mozilla/css/basic_width_px.html" } ], + "css/block_formatting_context_a.html": [ + { + "path": "css/block_formatting_context_a.html", + "references": [ + [ + "/_mozilla/css/block_formatting_context_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/block_formatting_context_a.html" + } + ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", @@ -1652,6 +1664,18 @@ "url": "/_mozilla/css/basic_width_px.html" } ], + "css/block_formatting_context_a.html": [ + { + "path": "css/block_formatting_context_a.html", + "references": [ + [ + "/_mozilla/css/block_formatting_context_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/block_formatting_context_a.html" + } + ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", diff --git a/tests/ref/block_formatting_context_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_a.html similarity index 72% rename from tests/ref/block_formatting_context_a.html rename to tests/wpt/mozilla/tests/css/block_formatting_context_a.html index 241de2e22e4..eecad30e3e7 100644 --- a/tests/ref/block_formatting_context_a.html +++ b/tests/wpt/mozilla/tests/css/block_formatting_context_a.html @@ -1,5 +1,6 @@ +
4913
RIP Richard Kiel
diff --git a/tests/wpt/mozilla/tests/css/block_formatting_context_ref.html b/tests/wpt/mozilla/tests/css/block_formatting_context_ref.html new file mode 100644 index 00000000000..55b4e3a6fb2 --- /dev/null +++ b/tests/wpt/mozilla/tests/css/block_formatting_context_ref.html @@ -0,0 +1,7 @@ + + + +
4913
+
RIP Richard Kiel
+ + From 0c2c01f84df9906b820788414ae18414ffea5d85 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Wed, 14 Oct 2015 08:43:21 +0200 Subject: [PATCH 02/10] Move block_formatting_context_cleared_float_a.html to wpt reftests. --- tests/ref/basic.list | 1 - tests/wpt/mozilla/meta/MANIFEST.json | 24 +++++++++++++++++++ ...ck_formatting_context_cleared_float_a.html | 1 + ..._formatting_context_cleared_float_ref.html | 0 4 files changed, 25 insertions(+), 1 deletion(-) rename tests/{ref => wpt/mozilla/tests/css}/block_formatting_context_cleared_float_a.html (86%) rename tests/{ref => wpt/mozilla/tests/css}/block_formatting_context_cleared_float_ref.html (100%) diff --git a/tests/ref/basic.list b/tests/ref/basic.list index e43bb8db203..1ebed8f7cf7 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -12,7 +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_formatting_context_cleared_float_a.html block_formatting_context_cleared_float_ref.html == block_formatting_context_complex_a.html block_formatting_context_complex_ref.html == block_formatting_context_containing_floats_a.html block_formatting_context_containing_floats_ref.html == block_formatting_context_float_placement_a.html block_formatting_context_float_placement_ref.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 72acbf4843b..4eedc91a175 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -447,6 +447,18 @@ "url": "/_mozilla/css/block_formatting_context_a.html" } ], + "css/block_formatting_context_cleared_float_a.html": [ + { + "path": "css/block_formatting_context_cleared_float_a.html", + "references": [ + [ + "/_mozilla/css/block_formatting_context_cleared_float_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/block_formatting_context_cleared_float_a.html" + } + ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", @@ -1676,6 +1688,18 @@ "url": "/_mozilla/css/block_formatting_context_a.html" } ], + "css/block_formatting_context_cleared_float_a.html": [ + { + "path": "css/block_formatting_context_cleared_float_a.html", + "references": [ + [ + "/_mozilla/css/block_formatting_context_cleared_float_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/block_formatting_context_cleared_float_a.html" + } + ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", diff --git a/tests/ref/block_formatting_context_cleared_float_a.html b/tests/wpt/mozilla/tests/css/block_formatting_context_cleared_float_a.html similarity index 86% rename from tests/ref/block_formatting_context_cleared_float_a.html rename to tests/wpt/mozilla/tests/css/block_formatting_context_cleared_float_a.html index 495a09cc119..d91265b494d 100644 --- a/tests/ref/block_formatting_context_cleared_float_a.html +++ b/tests/wpt/mozilla/tests/css/block_formatting_context_cleared_float_a.html @@ -5,6 +5,7 @@ Tests that block formatting context inline-size speculation works when the floats that impact the block formatting context are cleared. --> +