Skip to content

Commit

Permalink
Auto merge of #7944 - Ms2ger:test-ref, r=jdm
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/7944)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Oct 9, 2015
2 parents 6d52bdf + 0dc3938 commit ea7b990
Show file tree
Hide file tree
Showing 23 changed files with 259 additions and 10 deletions.
10 changes: 0 additions & 10 deletions tests/ref/basic.list
View file
Expand Up @@ -12,16 +12,6 @@ fragment=top != ../html/acid2.html acid2_ref.html
== acid1_a.html acid1_b.html
== acid2_noscroll.html acid2_ref_broken.html
flaky_cpu == append_style_a.html append_style_b.html
== attr_selector_case_sensitivity.html attr_selector_case_sensitivity_ref.html
== background_clip_a.html background_clip_ref.html
== background_external_stylesheet.html background_ref.html
== background_image_a.html background_image_ref.html
== background_image_position_a.html background_image_position_ref.html
== background_none_a.html background_none_b.html
== background_origin_a.html background_origin_ref.html
== background_position_a.html background_position_b.html
== background_position_keyword.html background_position_b.html
== background_position_percent.html background_position_b.html
== background_position_shorthand.html background_position_shorthand_ref.html
== background_repeat_both_a.html background_repeat_both_b.html
== background_repeat_none_a.html background_repeat_none_b.html
Expand Down
240 changes: 240 additions & 0 deletions tests/wpt/mozilla/meta/MANIFEST.json
View file
Expand Up @@ -183,6 +183,18 @@
"url": "/_mozilla/css/attr_exists_selector.html"
}
],
"css/attr_selector_case_sensitivity.html": [
{
"path": "css/attr_selector_case_sensitivity.html",
"references": [
[
"/_mozilla/css/attr_selector_case_sensitivity_ref.html",
"=="
]
],
"url": "/_mozilla/css/attr_selector_case_sensitivity.html"
}
],
"css/background.html": [
{
"path": "css/background.html",
Expand All @@ -195,6 +207,114 @@
"url": "/_mozilla/css/background.html"
}
],
"css/background_clip_a.html": [
{
"path": "css/background_clip_a.html",
"references": [
[
"/_mozilla/css/background_clip_ref.html",
"=="
]
],
"url": "/_mozilla/css/background_clip_a.html"
}
],
"css/background_external_stylesheet.html": [
{
"path": "css/background_external_stylesheet.html",
"references": [
[
"/_mozilla/css/background_rust_ref.html",
"=="
]
],
"url": "/_mozilla/css/background_external_stylesheet.html"
}
],
"css/background_image_a.html": [
{
"path": "css/background_image_a.html",
"references": [
[
"/_mozilla/css/background_image_ref.html",
"=="
]
],
"url": "/_mozilla/css/background_image_a.html"
}
],
"css/background_image_position_a.html": [
{
"path": "css/background_image_position_a.html",
"references": [
[
"/_mozilla/css/background_image_position_ref.html",
"=="
]
],
"url": "/_mozilla/css/background_image_position_a.html"
}
],
"css/background_none_a.html": [
{
"path": "css/background_none_a.html",
"references": [
[
"/_mozilla/css/background_none_b.html",
"=="
]
],
"url": "/_mozilla/css/background_none_a.html"
}
],
"css/background_origin_a.html": [
{
"path": "css/background_origin_a.html",
"references": [
[
"/_mozilla/css/background_origin_ref.html",
"=="
]
],
"url": "/_mozilla/css/background_origin_a.html"
}
],
"css/background_position_a.html": [
{
"path": "css/background_position_a.html",
"references": [
[
"/_mozilla/css/background_position_b.html",
"=="
]
],
"url": "/_mozilla/css/background_position_a.html"
}
],
"css/background_position_keyword.html": [
{
"path": "css/background_position_keyword.html",
"references": [
[
"/_mozilla/css/background_position_b.html",
"=="
]
],
"url": "/_mozilla/css/background_position_keyword.html"
}
],
"css/background_position_percent.html": [
{
"path": "css/background_position_percent.html",
"references": [
[
"/_mozilla/css/background_position_b.html",
"=="
]
],
"url": "/_mozilla/css/background_position_percent.html"
}
],
"css/class-namespaces.html": [
{
"path": "css/class-namespaces.html",
Expand Down Expand Up @@ -1160,6 +1280,18 @@
"url": "/_mozilla/css/attr_exists_selector.html"
}
],
"css/attr_selector_case_sensitivity.html": [
{
"path": "css/attr_selector_case_sensitivity.html",
"references": [
[
"/_mozilla/css/attr_selector_case_sensitivity_ref.html",
"=="
]
],
"url": "/_mozilla/css/attr_selector_case_sensitivity.html"
}
],
"css/background.html": [
{
"path": "css/background.html",
Expand All @@ -1172,6 +1304,114 @@
"url": "/_mozilla/css/background.html"
}
],
"css/background_clip_a.html": [
{
"path": "css/background_clip_a.html",
"references": [
[
"/_mozilla/css/background_clip_ref.html",
"=="
]
],
"url": "/_mozilla/css/background_clip_a.html"
}
],
"css/background_external_stylesheet.html": [
{
"path": "css/background_external_stylesheet.html",
"references": [
[
"/_mozilla/css/background_rust_ref.html",
"=="
]
],
"url": "/_mozilla/css/background_external_stylesheet.html"
}
],
"css/background_image_a.html": [
{
"path": "css/background_image_a.html",
"references": [
[
"/_mozilla/css/background_image_ref.html",
"=="
]
],
"url": "/_mozilla/css/background_image_a.html"
}
],
"css/background_image_position_a.html": [
{
"path": "css/background_image_position_a.html",
"references": [
[
"/_mozilla/css/background_image_position_ref.html",
"=="
]
],
"url": "/_mozilla/css/background_image_position_a.html"
}
],
"css/background_none_a.html": [
{
"path": "css/background_none_a.html",
"references": [
[
"/_mozilla/css/background_none_b.html",
"=="
]
],
"url": "/_mozilla/css/background_none_a.html"
}
],
"css/background_origin_a.html": [
{
"path": "css/background_origin_a.html",
"references": [
[
"/_mozilla/css/background_origin_ref.html",
"=="
]
],
"url": "/_mozilla/css/background_origin_a.html"
}
],
"css/background_position_a.html": [
{
"path": "css/background_position_a.html",
"references": [
[
"/_mozilla/css/background_position_b.html",
"=="
]
],
"url": "/_mozilla/css/background_position_a.html"
}
],
"css/background_position_keyword.html": [
{
"path": "css/background_position_keyword.html",
"references": [
[
"/_mozilla/css/background_position_b.html",
"=="
]
],
"url": "/_mozilla/css/background_position_keyword.html"
}
],
"css/background_position_percent.html": [
{
"path": "css/background_position_percent.html",
"references": [
[
"/_mozilla/css/background_position_b.html",
"=="
]
],
"url": "/_mozilla/css/background_position_percent.html"
}
],
"css/class-namespaces.html": [
{
"path": "css/class-namespaces.html",
Expand Down
1 change: 1 addition & 0 deletions ...s/ref/attr_selector_case_sensitivity.html → ...s/css/attr_selector_case_sensitivity.html
View file
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<title>Attribute selector case-sensitivity: [foo=bar] and [foo=bar i]</title>
<link rel=match href=attr_selector_case_sensitivity_ref.html>
<style>
p[data-foo=Bar] { color: green }
p[data-foo=bar] { color: red }
Expand Down
0 ...f/attr_selector_case_sensitivity_ref.html → ...s/attr_selector_case_sensitivity_ref.html
View file
File renamed without changes.
1 change: 1 addition & 0 deletions tests/ref/background_clip_a.html → .../mozilla/tests/css/background_clip_a.html
View file
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel=match href=background_clip_ref.html>
<style>
div {
background: green;
Expand Down
0 tests/ref/background_clip_ref.html → ...ozilla/tests/css/background_clip_ref.html
View file
File renamed without changes.
1 change: 1 addition & 0 deletions ...s/ref/background_external_stylesheet.html → ...s/css/background_external_stylesheet.html
View file
Expand Up @@ -3,6 +3,7 @@
<head>
<title></title>
<link rel="stylesheet" href="subdirectory/background_image.css">
<link rel=match href=background_rust_ref.html>
</head>
<body>
<div class="test" style="width:206px; height:206px;"></div>
Expand Down
1 change: 1 addition & 0 deletions tests/ref/background_image_a.html → ...mozilla/tests/css/background_image_a.html
View file
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel=match href=background_image_ref.html>
<style>
div {
background-image: url("test.jpeg");
Expand Down
1 change: 1 addition & 0 deletions tests/ref/background_image_position_a.html → ...ests/css/background_image_position_a.html
View file
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel=match href=background_image_position_ref.html>
<style type="text/css">
body {
font-family: 'ahem';
Expand Down
0 tests/ref/background_image_position_ref.html → ...ts/css/background_image_position_ref.html
View file
File renamed without changes.
0 tests/ref/background_image_ref.html → ...zilla/tests/css/background_image_ref.html
View file
File renamed without changes.
1 change: 1 addition & 0 deletions tests/ref/background_none_a.html → .../mozilla/tests/css/background_none_a.html
View file
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<title>background: none test</title>
<link rel=match href=background_none_b.html>
<style>
#a {
background: red;
Expand Down
0 tests/ref/background_none_b.html → .../mozilla/tests/css/background_none_b.html
View file
File renamed without changes.
1 change: 1 addition & 0 deletions tests/ref/background_origin_a.html → ...ozilla/tests/css/background_origin_a.html
View file
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel=match href=background_origin_ref.html>
<style>
#foo1 {
background: url(400x400_green.png);
Expand Down
0 tests/ref/background_origin_ref.html → ...illa/tests/css/background_origin_ref.html
View file
File renamed without changes.
1 change: 1 addition & 0 deletions tests/ref/background_position_a.html → ...illa/tests/css/background_position_a.html
View file
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<title>You see here a scroll labeled FOOBIE BLETCH.</title>
<link rel=match href=background_position_b.html>
<style>
#foo {
background: url(400x400_green.png);
Expand Down
0 tests/ref/background_position_b.html → ...illa/tests/css/background_position_b.html
View file
File renamed without changes.
1 change: 1 addition & 0 deletions tests/ref/background_position_keyword.html → ...ests/css/background_position_keyword.html
View file
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<title>You see here a scroll labeled FOOBIE BLETCH.</title>
<link rel=match href=background_position_b.html>
<style>
#foo {
background: url(400x400_green.png);
Expand Down
1 change: 1 addition & 0 deletions tests/ref/background_position_percent.html → ...ests/css/background_position_percent.html
View file
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<title>You see here a scroll labeled FOOBIE BLETCH.</title>
<link rel=match href=background_position_b.html>
<style>
#foo {
background: url(400x400_green.png);
Expand Down
9 changes: 9 additions & 0 deletions tests/wpt/mozilla/tests/css/background_rust_ref.html
View file
@@ -0,0 +1,9 @@
<!DOCTYPE html>
<html>
<head>
<title></title>
</head>
<body>
<img class="test" src="rust-0.png" style="width:206px; height:206px;" />
</body>
</html>
0 tests/ref/line.png → tests/wpt/mozilla/tests/css/line.png
View file
File renamed without changes
0 tests/ref/subdirectory/background_image.css → ...sts/css/subdirectory/background_image.css
View file
File renamed without changes.
Binary file added tests/wpt/mozilla/tests/css/test.jpeg
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit ea7b990

Please sign in to comment.