diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-10-27 18:45:25 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-10-27 18:45:25 +0530 |
commit | 484c0e45461fa2beb5fc186f51e76671076149db (patch) | |
tree | b72fc565c95af6655bdf10e384b864bf82d453c1 | |
parent | a6e2c138db156a7b817107b22c482010ebcdcf2a (diff) | |
parent | c265c52939ee6e14630d70c3969c64688e0dcc6f (diff) | |
download | servo-484c0e45461fa2beb5fc186f51e76671076149db.tar.gz servo-484c0e45461fa2beb5fc186f51e76671076149db.zip |
Auto merge of #8222 - 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/8222)
<!-- Reviewable:end -->
-rw-r--r-- | tests/ref/basic.list | 5 | ||||
-rw-r--r-- | tests/wpt/mozilla/meta/MANIFEST.json | 168 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/border_spacing_auto_layout_a.html (renamed from tests/ref/border_spacing_auto_layout_a.html) | 1 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/border_spacing_fixed_layout_a.html (renamed from tests/ref/border_spacing_fixed_layout_a.html) | 1 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/borders.png (renamed from tests/ref/borders.png) | bin | 8233 -> 8233 bytes | |||
-rw-r--r-- | tests/wpt/mozilla/tests/css/borders_a.html (renamed from tests/ref/borders_a.html) | 1 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/borders_b.html (renamed from tests/ref/borders_b.html) | 0 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/box_shadow_blur_a.html (renamed from tests/ref/box_shadow_blur_a.html) | 1 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/box_shadow_blur_ref.html (renamed from tests/ref/box_shadow_blur_ref.html) | 0 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/box_shadow_default_color_a.html (renamed from tests/ref/box_shadow_default_color_a.html) | 1 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/box_shadow_default_color_ref.html (renamed from tests/ref/box_shadow_default_color_ref.html) | 0 |
11 files changed, 149 insertions, 29 deletions
diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 778aa7c475a..dd24a6924f1 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -11,11 +11,6 @@ fragment=top != ../html/acid2.html acid2_ref.html == acid2_noscroll.html acid2_ref_broken.html flaky_cpu == append_style_a.html append_style_b.html -== border_spacing_auto_layout_a.html border_spacing_ref.html -== border_spacing_fixed_layout_a.html border_spacing_ref.html -== borders_a.html borders_b.html -!= box_shadow_blur_a.html box_shadow_blur_ref.html -== box_shadow_default_color_a.html box_shadow_default_color_ref.html == box_shadow_inset_a.html box_shadow_inset_ref.html == box_shadow_inset_parsing_a.html box_shadow_inset_parsing_ref.html == box_shadow_spread_a.html box_shadow_spread_ref.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 63c0c8a7eef..c586b97dae7 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -791,6 +791,18 @@ "url": "/_mozilla/css/border_spacing_a.html" } ], + "css/border_spacing_auto_layout_a.html": [ + { + "path": "css/border_spacing_auto_layout_a.html", + "references": [ + [ + "/_mozilla/css/border_spacing_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/border_spacing_auto_layout_a.html" + } + ], "css/border_spacing_empty_table.html": [ { "path": "css/border_spacing_empty_table.html", @@ -803,6 +815,18 @@ "url": "/_mozilla/css/border_spacing_empty_table.html" } ], + "css/border_spacing_fixed_layout_a.html": [ + { + "path": "css/border_spacing_fixed_layout_a.html", + "references": [ + [ + "/_mozilla/css/border_spacing_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/border_spacing_fixed_layout_a.html" + } + ], "css/border_style_none_a.html": [ { "path": "css/border_style_none_a.html", @@ -815,6 +839,18 @@ "url": "/_mozilla/css/border_style_none_a.html" } ], + "css/borders_a.html": [ + { + "path": "css/borders_a.html", + "references": [ + [ + "/_mozilla/css/borders_b.html", + "==" + ] + ], + "url": "/_mozilla/css/borders_a.html" + } + ], "css/box_shadow_bg.html": [ { "path": "css/box_shadow_bg.html", @@ -827,6 +863,18 @@ "url": "/_mozilla/css/box_shadow_bg.html" } ], + "css/box_shadow_blur_a.html": [ + { + "path": "css/box_shadow_blur_a.html", + "references": [ + [ + "/_mozilla/css/box_shadow_blur_ref.html", + "!=" + ] + ], + "url": "/_mozilla/css/box_shadow_blur_a.html" + } + ], "css/box_shadow_border_box_a.html": [ { "path": "css/box_shadow_border_box_a.html", @@ -839,6 +887,18 @@ "url": "/_mozilla/css/box_shadow_border_box_a.html" } ], + "css/box_shadow_default_color_a.html": [ + { + "path": "css/box_shadow_default_color_a.html", + "references": [ + [ + "/_mozilla/css/box_shadow_default_color_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/box_shadow_default_color_a.html" + } + ], "css/box_shadow_inset_bg.html": [ { "path": "css/box_shadow_inset_bg.html", @@ -899,6 +959,18 @@ "url": "/_mozilla/css/br.html" } ], + "css/button_css_width.html": [ + { + "path": "css/button_css_width.html", + "references": [ + [ + "/_mozilla/css/button_css_width_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/button_css_width.html" + } + ], "css/calc-basic.html": [ { "path": "css/calc-basic.html", @@ -947,18 +1019,6 @@ "url": "/_mozilla/css/case-insensitive-font-family.html" } ], - "css/button_css_width.html": [ - { - "path": "css/button_css_width.html", - "references": [ - [ - "/_mozilla/css/button_css_width_ref.html", - "==" - ] - ], - "url": "/_mozilla/css/button_css_width.html" - } - ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", @@ -5328,6 +5388,18 @@ "url": "/_mozilla/css/border_spacing_a.html" } ], + "css/border_spacing_auto_layout_a.html": [ + { + "path": "css/border_spacing_auto_layout_a.html", + "references": [ + [ + "/_mozilla/css/border_spacing_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/border_spacing_auto_layout_a.html" + } + ], "css/border_spacing_empty_table.html": [ { "path": "css/border_spacing_empty_table.html", @@ -5340,6 +5412,18 @@ "url": "/_mozilla/css/border_spacing_empty_table.html" } ], + "css/border_spacing_fixed_layout_a.html": [ + { + "path": "css/border_spacing_fixed_layout_a.html", + "references": [ + [ + "/_mozilla/css/border_spacing_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/border_spacing_fixed_layout_a.html" + } + ], "css/border_style_none_a.html": [ { "path": "css/border_style_none_a.html", @@ -5352,6 +5436,18 @@ "url": "/_mozilla/css/border_style_none_a.html" } ], + "css/borders_a.html": [ + { + "path": "css/borders_a.html", + "references": [ + [ + "/_mozilla/css/borders_b.html", + "==" + ] + ], + "url": "/_mozilla/css/borders_a.html" + } + ], "css/box_shadow_bg.html": [ { "path": "css/box_shadow_bg.html", @@ -5364,6 +5460,18 @@ "url": "/_mozilla/css/box_shadow_bg.html" } ], + "css/box_shadow_blur_a.html": [ + { + "path": "css/box_shadow_blur_a.html", + "references": [ + [ + "/_mozilla/css/box_shadow_blur_ref.html", + "!=" + ] + ], + "url": "/_mozilla/css/box_shadow_blur_a.html" + } + ], "css/box_shadow_border_box_a.html": [ { "path": "css/box_shadow_border_box_a.html", @@ -5376,6 +5484,18 @@ "url": "/_mozilla/css/box_shadow_border_box_a.html" } ], + "css/box_shadow_default_color_a.html": [ + { + "path": "css/box_shadow_default_color_a.html", + "references": [ + [ + "/_mozilla/css/box_shadow_default_color_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/box_shadow_default_color_a.html" + } + ], "css/box_shadow_inset_bg.html": [ { "path": "css/box_shadow_inset_bg.html", @@ -5436,6 +5556,18 @@ "url": "/_mozilla/css/br.html" } ], + "css/button_css_width.html": [ + { + "path": "css/button_css_width.html", + "references": [ + [ + "/_mozilla/css/button_css_width_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/button_css_width.html" + } + ], "css/calc-basic.html": [ { "path": "css/calc-basic.html", @@ -5484,18 +5616,6 @@ "url": "/_mozilla/css/case-insensitive-font-family.html" } ], - "css/button_css_width.html": [ - { - "path": "css/button_css_width.html", - "references": [ - [ - "/_mozilla/css/button_css_width_ref.html", - "==" - ] - ], - "url": "/_mozilla/css/button_css_width.html" - } - ], "css/class-namespaces.html": [ { "path": "css/class-namespaces.html", diff --git a/tests/ref/border_spacing_auto_layout_a.html b/tests/wpt/mozilla/tests/css/border_spacing_auto_layout_a.html index d8195e0c368..4a3922e2b70 100644 --- a/tests/ref/border_spacing_auto_layout_a.html +++ b/tests/wpt/mozilla/tests/css/border_spacing_auto_layout_a.html @@ -5,6 +5,7 @@ Tests that `border-spacing` with automatic table layout works when not all the column sizes are specified. --> +<link rel=match href=border_spacing_ref.html> <style> body, html { margin: 0; diff --git a/tests/ref/border_spacing_fixed_layout_a.html b/tests/wpt/mozilla/tests/css/border_spacing_fixed_layout_a.html index 0e6d8a1e630..f90fd485da4 100644 --- a/tests/ref/border_spacing_fixed_layout_a.html +++ b/tests/wpt/mozilla/tests/css/border_spacing_fixed_layout_a.html @@ -5,6 +5,7 @@ Tests that `border-spacing` with automatic table layout works when not all the column sizes are specified. --> +<link rel=match href=border_spacing_ref.html> <style> body, html { margin: 0; diff --git a/tests/ref/borders.png b/tests/wpt/mozilla/tests/css/borders.png Binary files differindex 1bbfc373b5e..1bbfc373b5e 100644 --- a/tests/ref/borders.png +++ b/tests/wpt/mozilla/tests/css/borders.png diff --git a/tests/ref/borders_a.html b/tests/wpt/mozilla/tests/css/borders_a.html index 0ec25b10740..cea6f3a94e4 100644 --- a/tests/ref/borders_a.html +++ b/tests/wpt/mozilla/tests/css/borders_a.html @@ -1,6 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html> <head> +<link rel=match href=borders_b.html> <style> #none{ border-style: none; diff --git a/tests/ref/borders_b.html b/tests/wpt/mozilla/tests/css/borders_b.html index d7d6399ced6..d7d6399ced6 100644 --- a/tests/ref/borders_b.html +++ b/tests/wpt/mozilla/tests/css/borders_b.html diff --git a/tests/ref/box_shadow_blur_a.html b/tests/wpt/mozilla/tests/css/box_shadow_blur_a.html index b49d2fa7837..04e148133c3 100644 --- a/tests/ref/box_shadow_blur_a.html +++ b/tests/wpt/mozilla/tests/css/box_shadow_blur_a.html @@ -1,5 +1,6 @@ <head> <!-- Tests that box-shadow blur does something. --> +<link rel=mismatch href=box_shadow_blur_ref.html> <style> section { position: absolute; diff --git a/tests/ref/box_shadow_blur_ref.html b/tests/wpt/mozilla/tests/css/box_shadow_blur_ref.html index 9bc6a693306..9bc6a693306 100644 --- a/tests/ref/box_shadow_blur_ref.html +++ b/tests/wpt/mozilla/tests/css/box_shadow_blur_ref.html diff --git a/tests/ref/box_shadow_default_color_a.html b/tests/wpt/mozilla/tests/css/box_shadow_default_color_a.html index fe36f41752d..2715959f1b5 100644 --- a/tests/ref/box_shadow_default_color_a.html +++ b/tests/wpt/mozilla/tests/css/box_shadow_default_color_a.html @@ -1,5 +1,6 @@ <head> <!-- Tests that the box-shadow color is correct if unspecified. --> +<link rel=match href=box_shadow_default_color_ref.html> <style> section { position: absolute; diff --git a/tests/ref/box_shadow_default_color_ref.html b/tests/wpt/mozilla/tests/css/box_shadow_default_color_ref.html index 3fff8f71892..3fff8f71892 100644 --- a/tests/ref/box_shadow_default_color_ref.html +++ b/tests/wpt/mozilla/tests/css/box_shadow_default_color_ref.html |