diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-03 20:34:39 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-12-03 20:34:39 +0530 |
commit | db0a0ac9f64e8701f93b322a5036b1c8a9ed52ca (patch) | |
tree | c3dfb7d2c024f388cc286fbc55b5d4373519e1d0 | |
parent | 782ca399a4297c4ac85a91ce7c3e4a63ae1c0214 (diff) | |
parent | 81a5948b2338a466802f86d2fa98d2e5a8a29230 (diff) | |
download | servo-db0a0ac9f64e8701f93b322a5036b1c8a9ed52ca.tar.gz servo-db0a0ac9f64e8701f93b322a5036b1c8a9ed52ca.zip |
Auto merge of #8793 - Ms2ger:test-ref, r=frewsxcv
Use wptrunner for some old-style reftests.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8793)
<!-- Reviewable:end -->
-rw-r--r-- | tests/ref/basic.list | 3 | ||||
-rw-r--r-- | tests/wpt/mozilla/meta/MANIFEST.json | 72 | ||||
-rw-r--r-- | tests/wpt/mozilla/meta/css/text_decoration_propagation_a.html.ini | 4 | ||||
-rw-r--r-- | tests/wpt/mozilla/meta/css/vertical-lr-blocks.html.ini | 5 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/text_decoration_propagation_a.html (renamed from tests/ref/text_decoration_propagation_a.html) | 1 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/text_decoration_propagation_b.html (renamed from tests/ref/text_decoration_propagation_b.html) | 0 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/text_overflow_a.html (renamed from tests/ref/text_overflow_a.html) | 1 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/text_overflow_ref.html (renamed from tests/ref/text_overflow_ref.html) | 0 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/vertical-lr-blocks.html (renamed from tests/ref/vertical-lr-blocks.html) | 1 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/vertical-lr-blocks_ref.html (renamed from tests/ref/vertical-lr-blocks_ref.html) | 0 |
10 files changed, 84 insertions, 3 deletions
diff --git a/tests/ref/basic.list b/tests/ref/basic.list index c0587599d9e..68a81c1b76d 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -15,9 +15,6 @@ flaky_cpu == append_style_a.html append_style_b.html resolution=300x300,device-pixel-ratio=2 != pixel_snapping_border_a.html pixel_snapping_border_ref.html resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_snapping_position_ref.html -# text_decoration_propagation_a.html text_decoration_propagation_b.html -!= text_overflow_a.html text_overflow_ref.html -flaky_cpu,prefs:"layout.writing-mode.enabled" == vertical-lr-blocks.html vertical-lr-blocks_ref.html resolution=800x600 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_a.html # resolution=600x800 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_b.html resolution=800x600 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_a.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index da86df98d0d..e96f940dda4 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -4375,6 +4375,18 @@ "url": "/_mozilla/css/text_decoration_cached.html" } ], + "css/text_decoration_propagation_a.html": [ + { + "path": "css/text_decoration_propagation_a.html", + "references": [ + [ + "/_mozilla/css/text_decoration_propagation_b.html", + "==" + ] + ], + "url": "/_mozilla/css/text_decoration_propagation_a.html" + } + ], "css/text_decoration_smoke_a.html": [ { "path": "css/text_decoration_smoke_a.html", @@ -4423,6 +4435,18 @@ "url": "/_mozilla/css/text_justify_none_a.html" } ], + "css/text_overflow_a.html": [ + { + "path": "css/text_overflow_a.html", + "references": [ + [ + "/_mozilla/css/text_overflow_ref.html", + "!=" + ] + ], + "url": "/_mozilla/css/text_overflow_a.html" + } + ], "css/text_overflow_basic_a.html": [ { "path": "css/text_overflow_basic_a.html", @@ -4627,6 +4651,18 @@ "url": "/_mozilla/css/upper_id_attr.html" } ], + "css/vertical-lr-blocks.html": [ + { + "path": "css/vertical-lr-blocks.html", + "references": [ + [ + "/_mozilla/css/vertical-lr-blocks_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/vertical-lr-blocks.html" + } + ], "css/vertical_align_bottom_a.html": [ { "path": "css/vertical_align_bottom_a.html", @@ -10146,6 +10182,18 @@ "url": "/_mozilla/css/text_decoration_cached.html" } ], + "css/text_decoration_propagation_a.html": [ + { + "path": "css/text_decoration_propagation_a.html", + "references": [ + [ + "/_mozilla/css/text_decoration_propagation_b.html", + "==" + ] + ], + "url": "/_mozilla/css/text_decoration_propagation_a.html" + } + ], "css/text_decoration_smoke_a.html": [ { "path": "css/text_decoration_smoke_a.html", @@ -10194,6 +10242,18 @@ "url": "/_mozilla/css/text_justify_none_a.html" } ], + "css/text_overflow_a.html": [ + { + "path": "css/text_overflow_a.html", + "references": [ + [ + "/_mozilla/css/text_overflow_ref.html", + "!=" + ] + ], + "url": "/_mozilla/css/text_overflow_a.html" + } + ], "css/text_overflow_basic_a.html": [ { "path": "css/text_overflow_basic_a.html", @@ -10398,6 +10458,18 @@ "url": "/_mozilla/css/upper_id_attr.html" } ], + "css/vertical-lr-blocks.html": [ + { + "path": "css/vertical-lr-blocks.html", + "references": [ + [ + "/_mozilla/css/vertical-lr-blocks_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/vertical-lr-blocks.html" + } + ], "css/vertical_align_bottom_a.html": [ { "path": "css/vertical_align_bottom_a.html", diff --git a/tests/wpt/mozilla/meta/css/text_decoration_propagation_a.html.ini b/tests/wpt/mozilla/meta/css/text_decoration_propagation_a.html.ini new file mode 100644 index 00000000000..12d7ad7b519 --- /dev/null +++ b/tests/wpt/mozilla/meta/css/text_decoration_propagation_a.html.ini @@ -0,0 +1,4 @@ +[text_decoration_propagation_a.html] + type: reftest + expected: FAIL + bug: https://github.com/servo/servo/issues/8783 diff --git a/tests/wpt/mozilla/meta/css/vertical-lr-blocks.html.ini b/tests/wpt/mozilla/meta/css/vertical-lr-blocks.html.ini new file mode 100644 index 00000000000..2858c27f6ed --- /dev/null +++ b/tests/wpt/mozilla/meta/css/vertical-lr-blocks.html.ini @@ -0,0 +1,5 @@ +prefs: [layout.writing-mode.enabled:true] +[vertical-lr-blocks.html] + type: reftest + expected: FAIL + bug: https://github.com/servo/servo/issues/3926 diff --git a/tests/ref/text_decoration_propagation_a.html b/tests/wpt/mozilla/tests/css/text_decoration_propagation_a.html index 4811fbb2a2a..52975110ef0 100644 --- a/tests/ref/text_decoration_propagation_a.html +++ b/tests/wpt/mozilla/tests/css/text_decoration_propagation_a.html @@ -2,6 +2,7 @@ <html> <head> <title>I CAN'T LIVE ANOTHER DAY WITHOUT AIR CONDITIONING!</title> +<link rel=match href=text_decoration_propagation_b.html> <style> #a { text-decoration: underline; diff --git a/tests/ref/text_decoration_propagation_b.html b/tests/wpt/mozilla/tests/css/text_decoration_propagation_b.html index ff7473ec78e..ff7473ec78e 100644 --- a/tests/ref/text_decoration_propagation_b.html +++ b/tests/wpt/mozilla/tests/css/text_decoration_propagation_b.html diff --git a/tests/ref/text_overflow_a.html b/tests/wpt/mozilla/tests/css/text_overflow_a.html index 70818c2b914..2a3ca5be0f7 100644 --- a/tests/ref/text_overflow_a.html +++ b/tests/wpt/mozilla/tests/css/text_overflow_a.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html> <head> +<link rel=mismatch href=text_overflow_ref.html> <style> p { width: 128px; diff --git a/tests/ref/text_overflow_ref.html b/tests/wpt/mozilla/tests/css/text_overflow_ref.html index 19adf5d9104..19adf5d9104 100644 --- a/tests/ref/text_overflow_ref.html +++ b/tests/wpt/mozilla/tests/css/text_overflow_ref.html diff --git a/tests/ref/vertical-lr-blocks.html b/tests/wpt/mozilla/tests/css/vertical-lr-blocks.html index c68fee90788..46d8586a6fc 100644 --- a/tests/ref/vertical-lr-blocks.html +++ b/tests/wpt/mozilla/tests/css/vertical-lr-blocks.html @@ -1,6 +1,7 @@ <!doctype html> <html> <head> +<link rel=match href=vertical-lr-blocks_ref.html> <style> html { writing-mode: vertical-rl } body { margin: 10px } diff --git a/tests/ref/vertical-lr-blocks_ref.html b/tests/wpt/mozilla/tests/css/vertical-lr-blocks_ref.html index 8581695c49f..8581695c49f 100644 --- a/tests/ref/vertical-lr-blocks_ref.html +++ b/tests/wpt/mozilla/tests/css/vertical-lr-blocks_ref.html |