aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2015-10-25 10:12:20 -0500
committerbors-servo <lbergstrom+bors@mozilla.com>2015-10-25 10:12:20 -0500
commit662ff9b8c2669b10134825f63669a51b39756c8b (patch)
treec30736f2b2253b82d92b12a3cb1c63070dae32a2
parent47f6eb744f50cb6598b6129ef38148f785052c59 (diff)
parentf59ef17921c78be135816e7549041d710a7e9b31 (diff)
downloadservo-662ff9b8c2669b10134825f63669a51b39756c8b.tar.gz
servo-662ff9b8c2669b10134825f63669a51b39756c8b.zip
Auto merge of #8185 - Ms2ger:white-space, r=frewsxcv
Correct the match urls for the white-space tests. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8185) <!-- Reviewable:end -->
-rw-r--r--tests/wpt/mozilla/meta/MANIFEST.json2
-rw-r--r--tests/wpt/mozilla/tests/css/white-space-mixed-002.htm2
-rw-r--r--tests/wpt/mozilla/tests/css/white-space-normal-001.htm2
-rw-r--r--tests/wpt/mozilla/tests/css/white-space-pre-line.htm1
-rw-r--r--tests/wpt/mozilla/tests/css/white-space-pre-wrap.htm1
5 files changed, 5 insertions, 3 deletions
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 3e6f6494f7d..98efe89c687 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -8490,4 +8490,4 @@
"rev": null,
"url_base": "/_mozilla/",
"version": 2
-}
+} \ No newline at end of file
diff --git a/tests/wpt/mozilla/tests/css/white-space-mixed-002.htm b/tests/wpt/mozilla/tests/css/white-space-mixed-002.htm
index 2c27b84a680..c8399602a7d 100644
--- a/tests/wpt/mozilla/tests/css/white-space-mixed-002.htm
+++ b/tests/wpt/mozilla/tests/css/white-space-mixed-002.htm
@@ -9,7 +9,7 @@
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2012-06-29 -->
<link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/mixed/002.html" type="text/html">
<link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model">
- <link rel="match" href="reference/white-space-mixed-002-ref.htm">
+ <link rel="match" href="white-space-mixed-002-ref.htm">
<meta name="flags" content="ahem">
diff --git a/tests/wpt/mozilla/tests/css/white-space-normal-001.htm b/tests/wpt/mozilla/tests/css/white-space-normal-001.htm
index d71aaf5976a..33eef923592 100644
--- a/tests/wpt/mozilla/tests/css/white-space-normal-001.htm
+++ b/tests/wpt/mozilla/tests/css/white-space-normal-001.htm
@@ -9,7 +9,7 @@
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/"> <!-- 2012-06-29 -->
<link rel="alternate" href="http://www.hixie.ch/tests/adhoc/css/text/white-space/normal/001.html" type="text/html">
<link rel="help" href="http://www.w3.org/TR/CSS21/text.html#white-space-model">
- <link rel="match" href="reference/white-space-normal-001-ref.htm">
+ <link rel="match" href="white-space-normal-001-ref.htm">
<meta name="flags" content="ahem">
diff --git a/tests/wpt/mozilla/tests/css/white-space-pre-line.htm b/tests/wpt/mozilla/tests/css/white-space-pre-line.htm
index d9afec29d77..ed1cdb31a09 100644
--- a/tests/wpt/mozilla/tests/css/white-space-pre-line.htm
+++ b/tests/wpt/mozilla/tests/css/white-space-pre-line.htm
@@ -2,6 +2,7 @@
<html>
<head>
<title>whitespace pre-line basic functionality test</title>
+ <link rel=match href=white-space-pre-line-ref.htm>
<style>
div { white-space: pre-line; font: 1.25em/1 Ahem; width: 6em }
</style>
diff --git a/tests/wpt/mozilla/tests/css/white-space-pre-wrap.htm b/tests/wpt/mozilla/tests/css/white-space-pre-wrap.htm
index 22f61f31fab..ab6bc399c14 100644
--- a/tests/wpt/mozilla/tests/css/white-space-pre-wrap.htm
+++ b/tests/wpt/mozilla/tests/css/white-space-pre-wrap.htm
@@ -2,6 +2,7 @@
<html>
<head>
<title>whitespace pre-wrap basic functionality test</title>
+ <link rel=match href=white-space-pre-wrap-ref.htm>
<style>
div { white-space: pre-wrap; font: 1.25em/1 Ahem; width: 6em }
</style>