Skip to content

Commit

Permalink
Auto merge of #8635 - Ms2ger:test-ref, r=nox
Browse files Browse the repository at this point in the history 
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/8635)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Nov 21, 2015
2 parents 28582bb + bd25225 commit 3eef814
Show file tree
Hide file tree
Showing 18 changed files with 227 additions and 9 deletions.
9 changes: 0 additions & 9 deletions tests/ref/basic.list
View file
Expand Up @@ -48,22 +48,13 @@ resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_
# == position_fixed_a.html position_fixed_b.html
# == position_fixed_simple_a.html position_fixed_simple_b.html
# == position_fixed_static_y_a.html position_fixed_static_y_b.html
== position_fixed_tile_edge.html position_fixed_tile_edge_ref.html
== position_fixed_tile_edge_2.html position_fixed_tile_edge_ref.html
== position_fixed_tile_edge_3.html position_fixed_tile_edge_ref.html
== root_display_inline_a.html root_display_ref.html
== root_display_without_style_a.html root_display_ref.html
# text_decoration_propagation_a.html text_decoration_propagation_b.html
!= text_decoration_smoke_a.html text_decoration_smoke_ref.html
!= text_decoration_underline_subpx_a.html text_decoration_underline_subpx_ref.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
prefs:"layout.viewport.enabled" == viewport_meta.html viewport_rule_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
# resolution=600x800 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_b.html
prefs:"layout.viewport.enabled" == viewport_rule.html viewport_rule_ref.html

flaky_macos == white_space_intrinsic_sizes_a.html white_space_intrinsic_sizes_ref.html

Expand Down
216 changes: 216 additions & 0 deletions tests/wpt/mozilla/meta/MANIFEST.json
View file
Expand Up @@ -3295,6 +3295,42 @@
"url": "/_mozilla/css/position_fixed_overflow_a.html"
}
],
"css/position_fixed_tile_edge.html": [
{
"path": "css/position_fixed_tile_edge.html",
"references": [
[
"/_mozilla/css/position_fixed_tile_edge_ref.html",
"=="
]
],
"url": "/_mozilla/css/position_fixed_tile_edge.html"
}
],
"css/position_fixed_tile_edge_2.html": [
{
"path": "css/position_fixed_tile_edge_2.html",
"references": [
[
"/_mozilla/css/position_fixed_tile_edge_ref.html",
"=="
]
],
"url": "/_mozilla/css/position_fixed_tile_edge_2.html"
}
],
"css/position_fixed_tile_edge_3.html": [
{
"path": "css/position_fixed_tile_edge_3.html",
"references": [
[
"/_mozilla/css/position_fixed_tile_edge_ref.html",
"=="
]
],
"url": "/_mozilla/css/position_fixed_tile_edge_3.html"
}
],
"css/position_relative_a.html": [
{
"path": "css/position_relative_a.html",
Expand Down Expand Up @@ -3487,6 +3523,30 @@
"url": "/_mozilla/css/restyle_hints_state.html"
}
],
"css/root_display_inline_a.html": [
{
"path": "css/root_display_inline_a.html",
"references": [
[
"/_mozilla/css/root_display_ref.html",
"=="
]
],
"url": "/_mozilla/css/root_display_inline_a.html"
}
],
"css/root_display_without_style_a.html": [
{
"path": "css/root_display_without_style_a.html",
"references": [
[
"/_mozilla/css/root_display_ref.html",
"=="
]
],
"url": "/_mozilla/css/root_display_without_style_a.html"
}
],
"css/root_height_a.html": [
{
"path": "css/root_height_a.html",
Expand Down Expand Up @@ -3991,6 +4051,30 @@
"url": "/_mozilla/css/text_decoration_cached.html"
}
],
"css/text_decoration_smoke_a.html": [
{
"path": "css/text_decoration_smoke_a.html",
"references": [
[
"/_mozilla/css/text_decoration_smoke_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_decoration_smoke_a.html"
}
],
"css/text_decoration_underline_subpx_a.html": [
{
"path": "css/text_decoration_underline_subpx_a.html",
"references": [
[
"/_mozilla/css/text_decoration_underline_subpx_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_decoration_underline_subpx_a.html"
}
],
"css/text_indent_a.html": [
{
"path": "css/text_indent_a.html",
Expand Down Expand Up @@ -4363,6 +4447,30 @@
"url": "/_mozilla/css/viewport_ignore_desktop.html"
}
],
"css/viewport_meta.html": [
{
"path": "css/viewport_meta.html",
"references": [
[
"/_mozilla/css/viewport_rule_ref.html",
"=="
]
],
"url": "/_mozilla/css/viewport_meta.html"
}
],
"css/viewport_rule.html": [
{
"path": "css/viewport_rule.html",
"references": [
[
"/_mozilla/css/viewport_rule_ref.html",
"=="
]
],
"url": "/_mozilla/css/viewport_rule.html"
}
],
"css/visibility_hidden.html": [
{
"path": "css/visibility_hidden.html",
Expand Down Expand Up @@ -8628,6 +8736,42 @@
"url": "/_mozilla/css/position_fixed_overflow_a.html"
}
],
"css/position_fixed_tile_edge.html": [
{
"path": "css/position_fixed_tile_edge.html",
"references": [
[
"/_mozilla/css/position_fixed_tile_edge_ref.html",
"=="
]
],
"url": "/_mozilla/css/position_fixed_tile_edge.html"
}
],
"css/position_fixed_tile_edge_2.html": [
{
"path": "css/position_fixed_tile_edge_2.html",
"references": [
[
"/_mozilla/css/position_fixed_tile_edge_ref.html",
"=="
]
],
"url": "/_mozilla/css/position_fixed_tile_edge_2.html"
}
],
"css/position_fixed_tile_edge_3.html": [
{
"path": "css/position_fixed_tile_edge_3.html",
"references": [
[
"/_mozilla/css/position_fixed_tile_edge_ref.html",
"=="
]
],
"url": "/_mozilla/css/position_fixed_tile_edge_3.html"
}
],
"css/position_relative_a.html": [
{
"path": "css/position_relative_a.html",
Expand Down Expand Up @@ -8820,6 +8964,30 @@
"url": "/_mozilla/css/restyle_hints_state.html"
}
],
"css/root_display_inline_a.html": [
{
"path": "css/root_display_inline_a.html",
"references": [
[
"/_mozilla/css/root_display_ref.html",
"=="
]
],
"url": "/_mozilla/css/root_display_inline_a.html"
}
],
"css/root_display_without_style_a.html": [
{
"path": "css/root_display_without_style_a.html",
"references": [
[
"/_mozilla/css/root_display_ref.html",
"=="
]
],
"url": "/_mozilla/css/root_display_without_style_a.html"
}
],
"css/root_height_a.html": [
{
"path": "css/root_height_a.html",
Expand Down Expand Up @@ -9324,6 +9492,30 @@
"url": "/_mozilla/css/text_decoration_cached.html"
}
],
"css/text_decoration_smoke_a.html": [
{
"path": "css/text_decoration_smoke_a.html",
"references": [
[
"/_mozilla/css/text_decoration_smoke_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_decoration_smoke_a.html"
}
],
"css/text_decoration_underline_subpx_a.html": [
{
"path": "css/text_decoration_underline_subpx_a.html",
"references": [
[
"/_mozilla/css/text_decoration_underline_subpx_ref.html",
"!="
]
],
"url": "/_mozilla/css/text_decoration_underline_subpx_a.html"
}
],
"css/text_indent_a.html": [
{
"path": "css/text_indent_a.html",
Expand Down Expand Up @@ -9696,6 +9888,30 @@
"url": "/_mozilla/css/viewport_ignore_desktop.html"
}
],
"css/viewport_meta.html": [
{
"path": "css/viewport_meta.html",
"references": [
[
"/_mozilla/css/viewport_rule_ref.html",
"=="
]
],
"url": "/_mozilla/css/viewport_meta.html"
}
],
"css/viewport_rule.html": [
{
"path": "css/viewport_rule.html",
"references": [
[
"/_mozilla/css/viewport_rule_ref.html",
"=="
]
],
"url": "/_mozilla/css/viewport_rule.html"
}
],
"css/visibility_hidden.html": [
{
"path": "css/visibility_hidden.html",
Expand Down
1 change: 1 addition & 0 deletions tests/wpt/mozilla/meta/css/viewport_meta.html.ini
View file
@@ -0,0 +1 @@
prefs: ["layout.viewport.enabled:true"]
1 change: 1 addition & 0 deletions tests/wpt/mozilla/meta/css/viewport_rule.html.ini
View file
@@ -0,0 +1 @@
prefs: ["layout.viewport.enabled:true"]
1 change: 1 addition & 0 deletions tests/ref/position_fixed_tile_edge.html → ...a/tests/css/position_fixed_tile_edge.html
View file
@@ -1,4 +1,5 @@
<html>
<link rel=match href=position_fixed_tile_edge_ref.html>
<body>
<div style="background: green; position: fixed; top: 0px; left: 512px; width: 20px; height: 20px;"></div>
</body>
Expand Down
1 change: 1 addition & 0 deletions tests/ref/position_fixed_tile_edge_2.html → ...tests/css/position_fixed_tile_edge_2.html
View file
@@ -1,4 +1,5 @@
<html>
<link rel=match href=position_fixed_tile_edge_ref.html>
<body>
<div style="position: absolute; top: 0px; left: 512px;">
<div style="position: absolute; background: green; width: 20px; height: 20px;"></div>
Expand Down
1 change: 1 addition & 0 deletions tests/ref/position_fixed_tile_edge_3.html → ...tests/css/position_fixed_tile_edge_3.html
View file
@@ -1,4 +1,5 @@
<html>
<link rel=match href=position_fixed_tile_edge_ref.html>
<body>
<div style="position: absolute; top: 0px; left: 0px;">
<div style="position: absolute; background: green; top: 0; margin-left: 512px; width: 20px; height: 20px;"></div>
Expand Down
0 tests/ref/position_fixed_tile_edge_ref.html → ...sts/css/position_fixed_tile_edge_ref.html
View file
File renamed without changes.
1 change: 1 addition & 0 deletions tests/ref/root_display_inline_a.html → ...illa/tests/css/root_display_inline_a.html
View file
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html style="display:inline">
<head>
<link rel=match href=root_display_ref.html>
</head>
<body>
Hello world!
Expand Down
0 tests/ref/root_display_ref.html → ...t/mozilla/tests/css/root_display_ref.html
View file
File renamed without changes.
1 change: 1 addition & 0 deletions tests/ref/root_display_without_style_a.html → ...sts/css/root_display_without_style_a.html
View file
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel=match href=root_display_ref.html>
<script>
document.removeChild(document.documentElement);
root = document.createElementNS(null, "html");
Expand Down
1 change: 1 addition & 0 deletions tests/ref/text_decoration_smoke_a.html → ...la/tests/css/text_decoration_smoke_a.html
View file
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<!-- Tests that `text-decoration` does something. -->
<link rel=mismatch href=text_decoration_smoke_ref.html>
<style>
#a {
text-decoration: underline;
Expand Down
0 tests/ref/text_decoration_smoke_ref.html → .../tests/css/text_decoration_smoke_ref.html
View file
File renamed without changes.
1 change: 1 addition & 0 deletions ...ef/text_decoration_underline_subpx_a.html → ...ss/text_decoration_underline_subpx_a.html
View file
Expand Up @@ -3,6 +3,7 @@
<head>
<meta charset="utf-8">
<title>Underline test</title>
<link rel=mismatch href=text_decoration_underline_subpx_ref.html>
<style>
p {
font: 14px "Times New Roman";
Expand Down
0 .../text_decoration_underline_subpx_ref.html → .../text_decoration_underline_subpx_ref.html
View file
File renamed without changes.
1 change: 1 addition & 0 deletions tests/ref/viewport_meta.html → .../wpt/mozilla/tests/css/viewport_meta.html
View file
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel=match href=viewport_rule_ref.html>
<meta name="viewport" content="width=240">
<style>
#container {
Expand Down
1 change: 1 addition & 0 deletions tests/ref/viewport_rule.html → .../wpt/mozilla/tests/css/viewport_rule.html
View file
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel=match href=viewport_rule_ref.html>
<style>
@viewport {
height: auto;
Expand Down
0 tests/ref/viewport_rule_ref.html → .../mozilla/tests/css/viewport_rule_ref.html
View file
File renamed without changes.

0 comments on commit 3eef814

Please sign in to comment.