Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #8736 - Ms2ger:test-ref, r=frewsxcv

Browse source 
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/8736)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-11-30 18:56:26 +05:30
commit a27a15f94b
11 changed files with 82 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/ref/basic.list
View file

@ -13,12 +13,6 @@ fragment=top != ../html/acid2.html acid2_ref.html
flaky_cpu == append_style_a.html append_style_b.html flaky_cpu == append_style_a.html append_style_b.html
# `?` and `#` in the name is a test for https://github.com/servo/servo/issues/3340 # `?` and `#` in the name is a test for https://github.com/servo/servo/issues/3340
# inline_border_a.html inline_border_b.html
flaky_cpu == linebreak_simple_a.html linebreak_simple_b.html
# Fails intermittently (#3636)
# == link_style_dynamic_addition.html link_style_dynamic_addition_ref.html
# Should be == with expected failure. See #2797
!= overconstrained_block.html overconstrained_block_ref.html
# Should be ==? # Should be ==?
!= overflow_position_abs_inside_normal_a.html overflow_position_abs_inside_normal_b.html != overflow_position_abs_inside_normal_a.html overflow_position_abs_inside_normal_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_border_a.html pixel_snapping_border_ref.html

27
tests/ref/inline_border_a.html
View file

@ -1,27 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<style>
html {
margin: 0;
padding: 0;
background-color: blue;
border: none;
}
body {
margin: 0;
padding: 0;
border: none;
}
</style>
</head>
<body>
<span style="border: 10px black solid"><img width="100" style="border:10px red solid" src="test.jpeg"></span>
<span style="background:red;font-size:35px;border: black 15px solid">
<span style="font-size:15px;background:yellow">
<img src="test.jpeg"/>
</span>
</span>
</body>
</html>

20
tests/ref/inline_border_b.html
View file

@ -1,20 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<style>
html {
margin: 0;
padding: 0;
background-color: blue;
border: none;
}
body {
margin: 0;
padding: 0;
border: none;
}
</style>
</head>
<body><img src="inline_border_ref.png"></body>
</html>

BIN
tests/ref/inline_border_ref.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 278 KiB

72
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -2719,6 +2719,30 @@
"url": "/_mozilla/css/linebreak_inline_span_a.html" "url": "/_mozilla/css/linebreak_inline_span_a.html"
} }
], ],
"css/linebreak_simple_a.html": [
{
"path": "css/linebreak_simple_a.html",
"references": [
[
"/_mozilla/css/linebreak_simple_b.html",
"=="
]
],
"url": "/_mozilla/css/linebreak_simple_a.html"
}
],
"css/link_style_dynamic_addition.html": [
{
"path": "css/link_style_dynamic_addition.html",
"references": [
[
"/_mozilla/css/link_style_dynamic_addition_ref.html",
"=="
]
],
"url": "/_mozilla/css/link_style_dynamic_addition.html"
}
],
"css/link_style_order.html": [ "css/link_style_order.html": [
{ {
"path": "css/link_style_order.html", "path": "css/link_style_order.html",
@ -3223,6 +3247,18 @@
"url": "/_mozilla/css/outset_blackborder.html" "url": "/_mozilla/css/outset_blackborder.html"
} }
], ],
"css/overconstrained_block.html": [
{
"path": "css/overconstrained_block.html",
"references": [
[
"/_mozilla/css/overconstrained_block_ref.html",
"=="
]
],
"url": "/_mozilla/css/overconstrained_block.html"
}
],
"css/overflow_auto.html": [ "css/overflow_auto.html": [
{ {
"path": "css/overflow_auto.html", "path": "css/overflow_auto.html",
@ -8406,6 +8442,30 @@
"url": "/_mozilla/css/linebreak_inline_span_a.html" "url": "/_mozilla/css/linebreak_inline_span_a.html"
} }
], ],
"css/linebreak_simple_a.html": [
{
"path": "css/linebreak_simple_a.html",
"references": [
[
"/_mozilla/css/linebreak_simple_b.html",
"=="
]
],
"url": "/_mozilla/css/linebreak_simple_a.html"
}
],
"css/link_style_dynamic_addition.html": [
{
"path": "css/link_style_dynamic_addition.html",
"references": [
[
"/_mozilla/css/link_style_dynamic_addition_ref.html",
"=="
]
],
"url": "/_mozilla/css/link_style_dynamic_addition.html"
}
],
"css/link_style_order.html": [ "css/link_style_order.html": [
{ {
"path": "css/link_style_order.html", "path": "css/link_style_order.html",
@ -8910,6 +8970,18 @@
"url": "/_mozilla/css/outset_blackborder.html" "url": "/_mozilla/css/outset_blackborder.html"
} }
], ],
"css/overconstrained_block.html": [
{
"path": "css/overconstrained_block.html",
"references": [
[
"/_mozilla/css/overconstrained_block_ref.html",
"=="
]
],
"url": "/_mozilla/css/overconstrained_block.html"
}
],
"css/overflow_auto.html": [ "css/overflow_auto.html": [
{ {
"path": "css/overflow_auto.html", "path": "css/overflow_auto.html",

1
tests/ref/linebreak_simple_a.html → tests/wpt/mozilla/tests/css/linebreak_simple_a.html
View file

@ -1,3 +1,4 @@
<link rel=match href=linebreak_simple_b.html>
<body style="width: 300px;"> <body style="width: 300px;">
<p style="margin: 0px;">A <span>hahahahahhahahhahahhahahhahahhahahhahahhahahahhahah</span> <span>fruitloopsfruitloopsfruitloops</span> <p style="margin: 0px;">A <span>hahahahahhahahhahahhahahhahahhahahhahahhahahahhahah</span> <span>fruitloopsfruitloopsfruitloops</span>
</body> </body>

0
tests/ref/linebreak_simple_b.html → tests/wpt/mozilla/tests/css/linebreak_simple_b.html
View file

4
tests/ref/link_style_dynamic_addition.html → tests/wpt/mozilla/tests/css/link_style_dynamic_addition.html
View file

@ -1,5 +1,7 @@
<html> <html>
<head></head> <head>
<link rel=match href=link_style_dynamic_addition_ref.html>
</head>
<body> <body>
<script> <script>
var link = document.createElement("link"); var link = document.createElement("link");

0
tests/ref/link_style_dynamic_addition_ref.html → tests/wpt/mozilla/tests/css/link_style_dynamic_addition_ref.html
View file

1
tests/ref/overconstrained_block.html → tests/wpt/mozilla/tests/css/overconstrained_block.html
View file

@ -1,6 +1,7 @@
<html> <html>
<head> <head>
<title>Block with over-contrained margins+borders+padding+width = containing block width</title> <title>Block with over-contrained margins+borders+padding+width = containing block width</title>
<link rel=match href=overconstrained_block_ref.html>
<style> <style>
body { width: 300px; margin: 0 0 0 400px } body { width: 300px; margin: 0 0 0 400px }
div:nth-child(even) { direction: rtl } div:nth-child(even) { direction: rtl }

9
tests/ref/overconstrained_block_ref.html → tests/wpt/mozilla/tests/css/overconstrained_block_ref.html
View file

@ -7,9 +7,10 @@
</style> </style>
</head> </head>
<body> <body>
<p style="top: 20px; left: 70px"></p> <p style="top: 20px; left: 470px"></p>
<p style="top: 140px; left: 30px"></p> <p style="top: 140px; left: 430px"></p>
<p style="top: 260px; left: 120px"></p> <p style="top: 260px; left: 520px"></p>
<p style="top: 380px; left: -20px"></p> <!-- https://github.com/servo/servo/issues/8721: should be left: 380px -->
<p style="top: 380px; left: 360px"></p>
</body> </body>
</html> </html>