From 727d89bb443d550f8f0c3cc3e5dfc3717ca0e12e Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 10 Aug 2015 15:09:06 +0200 Subject: [PATCH] Run word-spacing tests under wpt. --- tests/ref/basic.list | 1 - tests/wpt/mozilla/meta/MANIFEST.json | 24 +++++++++++++++++++ tests/wpt/mozilla/tests/css/css/ahem.css | 5 ++++ .../mozilla/tests/css/word-spacing-ref.html} | 0 .../mozilla/tests/css/word-spacing.html} | 1 + 5 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 tests/wpt/mozilla/tests/css/css/ahem.css rename tests/{ref/word_spacing_ref.html => wpt/mozilla/tests/css/word-spacing-ref.html} (100%) rename tests/{ref/word_spacing_a.html => wpt/mozilla/tests/css/word-spacing.html} (83%) diff --git a/tests/ref/basic.list b/tests/ref/basic.list index ffaf75fa5ed..f9c51bd1bfd 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -357,7 +357,6 @@ experimental == viewport_rule.html viewport_rule_ref.html == whitespace_pre.html whitespace_pre_ref.html == width_nonreplaced_block_simple_a.html width_nonreplaced_block_simple_b.html == word_break_a.html word_break_ref.html -== word_spacing_a.html word_spacing_ref.html # This file must be sorted alphabetically. diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index d0b6512b141..ef9c5992923 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -99,6 +99,18 @@ "url": "/_mozilla/css/setpropertypriority.html" } ], + "css/word-spacing.html": [ + { + "path": "css/word-spacing.html", + "references": [ + [ + "/_mozilla/css/word-spacing-ref.html", + "==" + ] + ], + "url": "/_mozilla/css/word-spacing.html" + } + ], "mozilla/canvas/drawimage_html_image_1.html": [ { "path": "mozilla/canvas/drawimage_html_image_1.html", @@ -860,6 +872,18 @@ "url": "/_mozilla/css/setpropertypriority.html" } ], + "css/word-spacing.html": [ + { + "path": "css/word-spacing.html", + "references": [ + [ + "/_mozilla/css/word-spacing-ref.html", + "==" + ] + ], + "url": "/_mozilla/css/word-spacing.html" + } + ], "mozilla/canvas/drawimage_html_image_1.html": [ { "path": "mozilla/canvas/drawimage_html_image_1.html", diff --git a/tests/wpt/mozilla/tests/css/css/ahem.css b/tests/wpt/mozilla/tests/css/css/ahem.css new file mode 100644 index 00000000000..51eede74aaa --- /dev/null +++ b/tests/wpt/mozilla/tests/css/css/ahem.css @@ -0,0 +1,5 @@ +body { + font-family: 'ahem'; + font-size: 100px; + line-height: 1; +} diff --git a/tests/ref/word_spacing_ref.html b/tests/wpt/mozilla/tests/css/word-spacing-ref.html similarity index 100% rename from tests/ref/word_spacing_ref.html rename to tests/wpt/mozilla/tests/css/word-spacing-ref.html diff --git a/tests/ref/word_spacing_a.html b/tests/wpt/mozilla/tests/css/word-spacing.html similarity index 83% rename from tests/ref/word_spacing_a.html rename to tests/wpt/mozilla/tests/css/word-spacing.html index 335c6c6142f..3e0e7b72699 100644 --- a/tests/ref/word_spacing_a.html +++ b/tests/wpt/mozilla/tests/css/word-spacing.html @@ -1,5 +1,6 @@ +