Skip to content

Commit

Permalink
Auto merge of #8880 - Ms2ger:test-ref, r=frewsxcv
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/8880)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Dec 9, 2015
2 parents f4aa5b4 + 844965e commit 8ba470d
Show file tree
Hide file tree
Showing 10 changed files with 80 additions and 12 deletions.
12 changes: 0 additions & 12 deletions tests/ref/basic.list
@@ -1,27 +1,15 @@
# This file must be sorted alphabetically.
# 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:
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_position_a.html pixel_snapping_position_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

flaky_macos == white_space_intrinsic_sizes_a.html white_space_intrinsic_sizes_ref.html


# This file must be sorted alphabetically.
# Please run `./mach test-tidy` to check your changes.
72 changes: 72 additions & 0 deletions tests/wpt/mozilla/meta/MANIFEST.json
Expand Up @@ -151,6 +151,18 @@
"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": [
{
"path": "css/after_block_iteration.html",
Expand Down Expand Up @@ -199,6 +211,18 @@
"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": [
{
"path": "css/attr_exists_selector.html",
Expand Down Expand Up @@ -4891,6 +4915,18 @@
"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": [
{
"path": "css/whitespace_nowrap_a.html",
Expand Down Expand Up @@ -5982,6 +6018,18 @@
"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": [
{
"path": "css/after_block_iteration.html",
Expand Down Expand Up @@ -6030,6 +6078,18 @@
"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": [
{
"path": "css/attr_exists_selector.html",
Expand Down Expand Up @@ -10722,6 +10782,18 @@
"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": [
{
"path": "css/whitespace_nowrap_a.html",
Expand Down
@@ -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
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<title>The Second Acid Test</title>
<link rel=match href=acid2_ref_broken.html>
<style>
/* This disables the "scroll" part of the test,
which causes layering bugs */
Expand Down
File renamed without changes.
File renamed without changes
@@ -1 +1,2 @@
<link rel=match href=append_style_b.html>
<div style="background-color: blue">this is the story of a girl</div>
File renamed without changes.
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel=match href=white_space_intrinsic_sizes_ref.html>
<style type="text/css">
table {
width: 0;
Expand Down

0 comments on commit 8ba470d

Please sign in to comment.