Auto merge of #8880 - 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/8880)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-12-09 11:34:22 +05:30
commit 8ba470d79f
10 changed files with 80 additions and 12 deletions

View file

@ -1,18 +1,9 @@
# This file must be sorted alphabetically. # This file must be sorted alphabetically.
# Please run `./mach test-tidy` to check your changes. # Please run `./mach test-tidy` to check your changes.
# Should be != with expected failure:
# FIXME: use the real test when pixel-snapping for scrolling is fixed.
#fragment=top == ../html/acid2.html acid2_ref_broken.html
# Should be == with expected failure: # Should be == with expected failure:
fragment=top != ../html/acid2.html acid2_ref.html 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
# `?` and `#` in the name is a test for https://github.com/servo/servo/issues/3340
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
resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_snapping_position_ref.html resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_snapping_position_ref.html
resolution=800x600 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_a.html resolution=800x600 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_a.html
@ -20,8 +11,5 @@ resolution=800x600 == viewport_percentage_vmin_vmax.html viewport_percentage_vmi
resolution=800x600 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_a.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 # resolution=600x800 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_b.html
flaky_macos == white_space_intrinsic_sizes_a.html white_space_intrinsic_sizes_ref.html
# This file must be sorted alphabetically. # This file must be sorted alphabetically.
# Please run `./mach test-tidy` to check your changes. # Please run `./mach test-tidy` to check your changes.

View file

@ -151,6 +151,18 @@
"url": "/_mozilla/css/acid1_a.html" "url": "/_mozilla/css/acid1_a.html"
} }
], ],
"css/acid2_noscroll.html": [
{
"path": "css/acid2_noscroll.html",
"references": [
[
"/_mozilla/css/acid2_ref_broken.html",
"=="
]
],
"url": "/_mozilla/css/acid2_noscroll.html"
}
],
"css/after_block_iteration.html": [ "css/after_block_iteration.html": [
{ {
"path": "css/after_block_iteration.html", "path": "css/after_block_iteration.html",
@ -199,6 +211,18 @@
"url": "/_mozilla/css/anon_block_inherit_a.html" "url": "/_mozilla/css/anon_block_inherit_a.html"
} }
], ],
"css/append_style_a.html": [
{
"path": "css/append_style_a.html",
"references": [
[
"/_mozilla/css/append_style_b.html",
"=="
]
],
"url": "/_mozilla/css/append_style_a.html"
}
],
"css/attr_exists_selector.html": [ "css/attr_exists_selector.html": [
{ {
"path": "css/attr_exists_selector.html", "path": "css/attr_exists_selector.html",
@ -4891,6 +4915,18 @@
"url": "/_mozilla/css/white-space-pre-wrap.htm" "url": "/_mozilla/css/white-space-pre-wrap.htm"
} }
], ],
"css/white_space_intrinsic_sizes_a.html": [
{
"path": "css/white_space_intrinsic_sizes_a.html",
"references": [
[
"/_mozilla/css/white_space_intrinsic_sizes_ref.html",
"=="
]
],
"url": "/_mozilla/css/white_space_intrinsic_sizes_a.html"
}
],
"css/whitespace_nowrap_a.html": [ "css/whitespace_nowrap_a.html": [
{ {
"path": "css/whitespace_nowrap_a.html", "path": "css/whitespace_nowrap_a.html",
@ -5982,6 +6018,18 @@
"url": "/_mozilla/css/acid1_a.html" "url": "/_mozilla/css/acid1_a.html"
} }
], ],
"css/acid2_noscroll.html": [
{
"path": "css/acid2_noscroll.html",
"references": [
[
"/_mozilla/css/acid2_ref_broken.html",
"=="
]
],
"url": "/_mozilla/css/acid2_noscroll.html"
}
],
"css/after_block_iteration.html": [ "css/after_block_iteration.html": [
{ {
"path": "css/after_block_iteration.html", "path": "css/after_block_iteration.html",
@ -6030,6 +6078,18 @@
"url": "/_mozilla/css/anon_block_inherit_a.html" "url": "/_mozilla/css/anon_block_inherit_a.html"
} }
], ],
"css/append_style_a.html": [
{
"path": "css/append_style_a.html",
"references": [
[
"/_mozilla/css/append_style_b.html",
"=="
]
],
"url": "/_mozilla/css/append_style_a.html"
}
],
"css/attr_exists_selector.html": [ "css/attr_exists_selector.html": [
{ {
"path": "css/attr_exists_selector.html", "path": "css/attr_exists_selector.html",
@ -10722,6 +10782,18 @@
"url": "/_mozilla/css/white-space-pre-wrap.htm" "url": "/_mozilla/css/white-space-pre-wrap.htm"
} }
], ],
"css/white_space_intrinsic_sizes_a.html": [
{
"path": "css/white_space_intrinsic_sizes_a.html",
"references": [
[
"/_mozilla/css/white_space_intrinsic_sizes_ref.html",
"=="
]
],
"url": "/_mozilla/css/white_space_intrinsic_sizes_a.html"
}
],
"css/whitespace_nowrap_a.html": [ "css/whitespace_nowrap_a.html": [
{ {
"path": "css/whitespace_nowrap_a.html", "path": "css/whitespace_nowrap_a.html",

View file

@ -0,0 +1,5 @@
[white_space_intrinsic_sizes_a.html]
type: reftest
expected:
if os == "mac": FAIL
bug: https://github.com/servo/servo/issues/3926

View file

@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<title>The Second Acid Test</title> <title>The Second Acid Test</title>
<link rel=match href=acid2_ref_broken.html>
<style> <style>
/* This disables the "scroll" part of the test, /* This disables the "scroll" part of the test,
which causes layering bugs */ which causes layering bugs */

View file

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before After
Before After

View file

@ -1 +1,2 @@
<link rel=match href=append_style_b.html>
<div style="background-color: blue">this is the story of a girl</div> <div style="background-color: blue">this is the story of a girl</div>

View file

@ -1,6 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<link rel=match href=white_space_intrinsic_sizes_ref.html>
<style type="text/css"> <style type="text/css">
table { table {
width: 0; width: 0;