aboutsummaryrefslogtreecommitdiffstats
path: root/tests/wpt/css-tests/css-variables-1_dev
diff options
context:
space:
mode:
Diffstat (limited to 'tests/wpt/css-tests/css-variables-1_dev')
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/html/chapter-2.htm2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/html/chapter-3.htm2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/html/reference/variable-external-font-face-01-ref.htm11
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/html/reference/variable-reference-38-ref.htm14
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/html/reftest-toc.htm4
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/html/reftest.list4
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/html/variable-external-font-face-01.htm2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/html/variable-reference-38.htm2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/implementation-report-TEMPLATE.data8
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/testinfo.data4
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-2.xht2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-3.xht2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/variable-external-font-face-01-ref.xht11
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/variable-reference-38-ref.xht14
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest-toc.xht4
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest.list4
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-external-font-face-01.xht2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-reference-38.xht2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-2.xht2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-3.xht2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-external-font-face-01-ref.xht11
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-reference-38-ref.xht14
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest-toc.xht4
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest.list4
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-external-font-face-01.xht2
-rw-r--r--tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-reference-38.xht2
26 files changed, 105 insertions, 30 deletions
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/chapter-2.htm b/tests/wpt/css-tests/css-variables-1_dev/html/chapter-2.htm
index 7b6b71159a3..aacb28ba17e 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/chapter-2.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/chapter-2.htm
@@ -222,7 +222,7 @@
<tr id="variable-external-font-face-01-2" class="primary ahem">
<td><strong>
<a href="variable-external-font-face-01.htm">variable-external-font-face-01</a></strong></td>
- <td><a href="reference/variable-font-face-01-ref.htm">=</a> </td>
+ <td><a href="reference/variable-external-font-face-01-ref.htm">=</a> </td>
<td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
<td>Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.
</td>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/chapter-3.htm b/tests/wpt/css-tests/css-variables-1_dev/html/chapter-3.htm
index a51e91a1026..363895a4d98 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/chapter-3.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/chapter-3.htm
@@ -686,7 +686,7 @@
<tr id="variable-reference-38-3.2" class="primary">
<td><strong>
<a href="variable-reference-38.htm">variable-reference-38</a></strong></td>
- <td><a href="reference/variable-declaration-59-ref.htm">=</a> </td>
+ <td><a href="reference/variable-reference-38-ref.htm">=</a> </td>
<td></td>
<td>Test using variables in overlapping shorthands.
</td>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/reference/variable-external-font-face-01-ref.htm b/tests/wpt/css-tests/css-variables-1_dev/html/reference/variable-external-font-face-01-ref.htm
new file mode 100644
index 00000000000..29522e1fdcd
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/reference/variable-external-font-face-01-ref.htm
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html><head><title>CSS Reftest Reference</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
+<link href="support/ahem.css" type="text/css" rel="stylesheet">
+<meta content="ahem" name="flags">
+</head><body><p>This text must not be in Ahem.</p>
+<p style="font-family: Ahem">But this text must be in Ahem.</p>
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/reference/variable-reference-38-ref.htm b/tests/wpt/css-tests/css-variables-1_dev/html/reference/variable-reference-38-ref.htm
new file mode 100644
index 00000000000..c01c3595a64
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/reference/variable-reference-38-ref.htm
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html><head><title>CSS Reftest Reference</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
+<style>
+p { padding-left: 1em; }
+#a { border-left: black dotted; }
+#b { border-left: black solid; }
+</style>
+</head><body><p id="a">The left border must be dotted.</p>
+<p id="b">The left border must be solid.</p>
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/reftest-toc.htm b/tests/wpt/css-tests/css-variables-1_dev/html/reftest-toc.htm
index 14d2635f2ec..ceff5a71b9e 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/reftest-toc.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/reftest-toc.htm
@@ -524,7 +524,7 @@
<tr>
<td rowspan="1" title="Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.">
<a href="variable-external-font-face-01.htm">variable-external-font-face-01</a></td>
- <td><a href="reference/variable-font-face-01-ref.htm">=</a> </td>
+ <td><a href="reference/variable-external-font-face-01-ref.htm">=</a> </td>
<td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
</tr>
</tbody>
@@ -860,7 +860,7 @@
<tr>
<td rowspan="1" title="Test using variables in overlapping shorthands.">
<a href="variable-reference-38.htm">variable-reference-38</a></td>
- <td><a href="reference/variable-declaration-59-ref.htm">=</a> </td>
+ <td><a href="reference/variable-reference-38-ref.htm">=</a> </td>
<td rowspan="1"></td>
</tr>
</tbody>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/reftest.list b/tests/wpt/css-tests/css-variables-1_dev/html/reftest.list
index 95c8eefac09..5a47e17ae20 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/reftest.list
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/reftest.list
@@ -61,7 +61,7 @@ variable-declaration-58.htm == support/color-green-ref.htm
variable-declaration-59.htm == support/color-green-ref.htm
variable-declaration-60.htm == support/color-green-ref.htm
variable-external-declaration-01.htm == support/color-green-ref.htm
-variable-external-font-face-01.htm == reference/variable-font-face-01-ref.htm
+variable-external-font-face-01.htm == reference/variable-external-font-face-01-ref.htm
variable-external-reference-01.htm == support/color-green-ref.htm
variable-external-supports-01.htm == support/color-green-ref.htm
variable-font-face-01.htm == reference/variable-font-face-01-ref.htm
@@ -103,7 +103,7 @@ variable-reference-34.htm == support/color-green-ref.htm
variable-reference-35.htm == support/color-green-ref.htm
variable-reference-36.htm == reference/variable-reference-36-ref.htm
variable-reference-37.htm == reference/variable-reference-37-ref.htm
-variable-reference-38.htm == reference/variable-declaration-59-ref.htm
+variable-reference-38.htm == reference/variable-reference-38-ref.htm
variable-reference-39.htm == support/color-green-ref.htm
variable-reference-40.htm == reference/variable-reference-40-ref.htm
variable-supports-01.htm == support/color-green-ref.htm
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/variable-external-font-face-01.htm b/tests/wpt/css-tests/css-variables-1_dev/html/variable-external-font-face-01.htm
index a1578660a34..bc04b4f2d90 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/variable-external-font-face-01.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/variable-external-font-face-01.htm
@@ -5,7 +5,7 @@
--><html><head><title>CSS Test: Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.</title>
<link href="mailto:mihaela.velimiroviciu@softvisioninc.eu" rel="author" title="Mihaela Velimiroviciu">
<link href="http://www.w3.org/TR/css-variables-1/#defining-variables" rel="help">
-<link href="reference/variable-font-face-01-ref.htm" rel="match">
+<link href="reference/variable-external-font-face-01-ref.htm" rel="match">
<link href="support/external-variable-font-face.css" type="text/css" rel="stylesheet">
<meta content="ahem" name="flags">
</head><body><p id="a">This text must not be in Ahem.</p>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/html/variable-reference-38.htm b/tests/wpt/css-tests/css-variables-1_dev/html/variable-reference-38.htm
index 02a98f655bc..7691cdcd5e2 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/html/variable-reference-38.htm
+++ b/tests/wpt/css-tests/css-variables-1_dev/html/variable-reference-38.htm
@@ -5,7 +5,7 @@
--><html><head><title>CSS Test: Test using variables in overlapping shorthands.</title>
<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack">
<link href="http://www.w3.org/TR/css-variables-1/#variables-in-shorthands" rel="help">
-<link href="reference/variable-declaration-59-ref.htm" rel="match">
+<link href="reference/variable-reference-38-ref.htm" rel="match">
<style>
p { padding-left: 1em; }
#a { --style: solid; --left: black dotted; border-style: var(--style); border-left: var(--left); border-top: none; border-right: none; border-bottom: none; }
diff --git a/tests/wpt/css-tests/css-variables-1_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-variables-1_dev/implementation-report-TEMPLATE.data
index 9be62bb2455..4dbcc8bb35d 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-variables-1_dev/implementation-report-TEMPLATE.data
@@ -129,8 +129,8 @@ html/variable-declaration-60.htm 18d840323d5ee1f130db200c4a359017ff67f1d1 ?
xhtml1/variable-declaration-60.xht 18d840323d5ee1f130db200c4a359017ff67f1d1 ?
html/variable-external-declaration-01.htm 79eb559335b1a833d79a54bc70bbebd3c0b7703c ?
xhtml1/variable-external-declaration-01.xht 79eb559335b1a833d79a54bc70bbebd3c0b7703c ?
-html/variable-external-font-face-01.htm 3776bcd72a00610e68642a0ca0abf9be54580199 ?
-xhtml1/variable-external-font-face-01.xht 3776bcd72a00610e68642a0ca0abf9be54580199 ?
+html/variable-external-font-face-01.htm cd1c9a3316640edbbc8a10d235103ef5fb333f08 ?
+xhtml1/variable-external-font-face-01.xht cd1c9a3316640edbbc8a10d235103ef5fb333f08 ?
html/variable-external-reference-01.htm e1cb9adcf7f262364ebec3c2491b07c6c756f91f ?
xhtml1/variable-external-reference-01.xht e1cb9adcf7f262364ebec3c2491b07c6c756f91f ?
html/variable-external-supports-01.htm 4a4be82f521b45c6bd4e240ecefcc623e603e249 ?
@@ -213,8 +213,8 @@ html/variable-reference-36.htm 3b838d0ae59489a854cf00018761973db4089355 ?
xhtml1/variable-reference-36.xht 3b838d0ae59489a854cf00018761973db4089355 ?
html/variable-reference-37.htm 9d4813fc0163f114496fcfa2a9254949889ae8cc ?
xhtml1/variable-reference-37.xht 9d4813fc0163f114496fcfa2a9254949889ae8cc ?
-html/variable-reference-38.htm b88da6eb36f31a5f4845cfee72db0833cac81e1f ?
-xhtml1/variable-reference-38.xht b88da6eb36f31a5f4845cfee72db0833cac81e1f ?
+html/variable-reference-38.htm a51a3479ee624ccac3e677ebf988d5f0ff785a51 ?
+xhtml1/variable-reference-38.xht a51a3479ee624ccac3e677ebf988d5f0ff785a51 ?
html/variable-reference-39.htm 87d4f5a8474c7d505a5cedf330b69adbe72425e5 ?
xhtml1/variable-reference-39.xht 87d4f5a8474c7d505a5cedf330b69adbe72425e5 ?
html/variable-reference-40.htm 2dc90de2f2ee674455cc427c1ce8f1e62d9dffee ?
diff --git a/tests/wpt/css-tests/css-variables-1_dev/testinfo.data b/tests/wpt/css-tests/css-variables-1_dev/testinfo.data
index eb3acf32653..9d8583dc023 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-variables-1_dev/testinfo.data
@@ -62,7 +62,7 @@ variable-declaration-58 support/color-green-ref Test declaring a variable whose
variable-declaration-59 support/color-green-ref Test declaring a variable with a trailing invalid token. http://www.w3.org/TR/css-variables-1/#defining-variables ea4e390f4318091d38719cc6aad514524d84330a `Cameron McCormack`<mailto:cam@mcc.id.au>
variable-declaration-60 support/color-green-ref Test declaring a variable with a value whose name is "initial" but using Turkish dotted/dotless 'i's. http://www.w3.org/TR/css-variables-1/#syntax 18d840323d5ee1f130db200c4a359017ff67f1d1 `Cameron McCormack`<mailto:cam@mcc.id.au>
variable-external-declaration-01 support/color-green-ref Test declaring a variable in an external CSS file. http://www.w3.org/TR/css-variables-1/#syntax 79eb559335b1a833d79a54bc70bbebd3c0b7703c `Mihaela Velimiroviciu`<mailto:mihaela.velimiroviciu@softvisioninc.eu>
-variable-external-font-face-01 reference/variable-font-face-01-ref Test the invalid declaration and use of a variable in an @font-face rule within an external CSS. ahem http://www.w3.org/TR/css-variables-1/#defining-variables 3776bcd72a00610e68642a0ca0abf9be54580199 `Mihaela Velimiroviciu`<mailto:mihaela.velimiroviciu@softvisioninc.eu>
+variable-external-font-face-01 reference/variable-external-font-face-01-ref Test the invalid declaration and use of a variable in an @font-face rule within an external CSS. ahem http://www.w3.org/TR/css-variables-1/#defining-variables cd1c9a3316640edbbc8a10d235103ef5fb333f08 `Mihaela Velimiroviciu`<mailto:mihaela.velimiroviciu@softvisioninc.eu>
variable-external-reference-01 support/color-green-ref Test the use of a variable in a non-custom property where the variable value is inherited within an external CSS. http://www.w3.org/TR/css-variables-1/#using-variables e1cb9adcf7f262364ebec3c2491b07c6c756f91f `Mihaela Velimiroviciu`<mailto:mihaela.velimiroviciu@softvisioninc.eu>
variable-external-supports-01 support/color-green-ref Test a passing non-custom property declaration in an @supports rule where the property value contains a variable reference within an external stylesheet file. http://www.w3.org/TR/css-variables-1/#using-variables 4a4be82f521b45c6bd4e240ecefcc623e603e249 `Mihaela Velimiroviciu`<mailto:mihaela.velimiroviciu@softvisioninc.eu>
variable-font-face-01 reference/variable-font-face-01-ref Test the invalid declaration and use of a variable in an @font-face rule. ahem http://www.w3.org/TR/css-variables-1/#defining-variables aa02741631a4e3c9e61b631452f6bcb375dd53e4 `Cameron McCormack`<mailto:cam@mcc.id.au>
@@ -104,7 +104,7 @@ variable-reference-34 support/color-green-ref Test declaring a non-custom proper
variable-reference-35 support/color-green-ref Test declaring a non-custom property containing a variable reference with fallback is an implicitly closed URL due to EOF. http://www.w3.org/TR/css-variables-1/#using-variables 3bed29528ed99a863e596d7c09bee6296921ae03 `Cameron McCormack`<mailto:cam@mcc.id.au>
variable-reference-36 reference/variable-reference-36-ref Test declaring a non-custom shorthand property containing a variable reference. http://www.w3.org/TR/css-variables-1/#variables-in-shorthands 3b838d0ae59489a854cf00018761973db4089355 `Cameron McCormack`<mailto:cam@mcc.id.au>
variable-reference-37 reference/variable-reference-37-ref Test declaring a non-custom shorthand property containing a variable reference, with a subsequent property in the declaration block that overrides one of the shorthand's components. http://www.w3.org/TR/css-variables-1/#variables-in-shorthands 9d4813fc0163f114496fcfa2a9254949889ae8cc `Cameron McCormack`<mailto:cam@mcc.id.au>
-variable-reference-38 reference/variable-declaration-59-ref Test using variables in overlapping shorthands. http://www.w3.org/TR/css-variables-1/#variables-in-shorthands b88da6eb36f31a5f4845cfee72db0833cac81e1f `Cameron McCormack`<mailto:cam@mcc.id.au>
+variable-reference-38 reference/variable-reference-38-ref Test using variables in overlapping shorthands. http://www.w3.org/TR/css-variables-1/#variables-in-shorthands a51a3479ee624ccac3e677ebf988d5f0ff785a51 `Cameron McCormack`<mailto:cam@mcc.id.au>
variable-reference-39 support/color-green-ref Test declaring a variable that references itself but uses fallback. http://www.w3.org/TR/css-variables-1/#cycles 87d4f5a8474c7d505a5cedf330b69adbe72425e5 `Cameron McCormack`<mailto:cam@mcc.id.au>
variable-reference-40 reference/variable-reference-40-ref Test that a variable reference within a gradient value in a border-image shorthand parses correctly. http://www.w3.org/TR/css-variables-1/#using-variables 2dc90de2f2ee674455cc427c1ce8f1e62d9dffee `Cameron McCormack`<mailto:cam@mcc.id.au>
variable-supports-01 support/color-green-ref Test a passing non-custom property declaration in an @supports rule where the property value contains a variable reference and no white space tokens. http://www.w3.org/TR/css-variables-1/#using-variables aea47c3174023e5424aa8e183ae5915ea18d4ebc `Cameron McCormack`<mailto:cam@mcc.id.au>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-2.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-2.xht
index ce4bed17dc5..e55b81b9aa8 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-2.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-2.xht
@@ -222,7 +222,7 @@
<tr id="variable-external-font-face-01-2" class="primary ahem">
<td><strong>
<a href="variable-external-font-face-01.xht">variable-external-font-face-01</a></strong></td>
- <td><a href="reference/variable-font-face-01-ref.xht">=</a> </td>
+ <td><a href="reference/variable-external-font-face-01-ref.xht">=</a> </td>
<td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
<td>Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.
</td>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-3.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-3.xht
index 4963837eb6f..429a7818dcd 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-3.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/chapter-3.xht
@@ -686,7 +686,7 @@
<tr id="variable-reference-38-3.2" class="primary">
<td><strong>
<a href="variable-reference-38.xht">variable-reference-38</a></strong></td>
- <td><a href="reference/variable-declaration-59-ref.xht">=</a> </td>
+ <td><a href="reference/variable-reference-38-ref.xht">=</a> </td>
<td></td>
<td>Test using variables in overlapping shorthands.
</td>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/variable-external-font-face-01-ref.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/variable-external-font-face-01-ref.xht
new file mode 100644
index 00000000000..897d72ccbad
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/variable-external-font-face-01-ref.xht
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Reftest Reference</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack" />
+<link href="support/ahem.css" type="text/css" rel="stylesheet" />
+<meta content="ahem" name="flags" />
+</head><body><p>This text must not be in Ahem.</p>
+<p style="font-family: Ahem">But this text must be in Ahem.</p>
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/variable-reference-38-ref.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/variable-reference-38-ref.xht
new file mode 100644
index 00000000000..5ef35377112
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reference/variable-reference-38-ref.xht
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Reftest Reference</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack" />
+<style>
+p { padding-left: 1em; }
+#a { border-left: black dotted; }
+#b { border-left: black solid; }
+</style>
+</head><body><p id="a">The left border must be dotted.</p>
+<p id="b">The left border must be solid.</p>
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest-toc.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest-toc.xht
index 53d7aa4b7b5..8363b3229e0 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest-toc.xht
@@ -524,7 +524,7 @@
<tr>
<td rowspan="1" title="Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.">
<a href="variable-external-font-face-01.xht">variable-external-font-face-01</a></td>
- <td><a href="reference/variable-font-face-01-ref.xht">=</a> </td>
+ <td><a href="reference/variable-external-font-face-01-ref.xht">=</a> </td>
<td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
</tr>
</tbody>
@@ -860,7 +860,7 @@
<tr>
<td rowspan="1" title="Test using variables in overlapping shorthands.">
<a href="variable-reference-38.xht">variable-reference-38</a></td>
- <td><a href="reference/variable-declaration-59-ref.xht">=</a> </td>
+ <td><a href="reference/variable-reference-38-ref.xht">=</a> </td>
<td rowspan="1"></td>
</tr>
</tbody>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest.list b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest.list
index 5062fadb337..cf111f0dab3 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest.list
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/reftest.list
@@ -61,7 +61,7 @@ variable-declaration-58.xht == support/color-green-ref.xht
variable-declaration-59.xht == support/color-green-ref.xht
variable-declaration-60.xht == support/color-green-ref.xht
variable-external-declaration-01.xht == support/color-green-ref.xht
-variable-external-font-face-01.xht == reference/variable-font-face-01-ref.xht
+variable-external-font-face-01.xht == reference/variable-external-font-face-01-ref.xht
variable-external-reference-01.xht == support/color-green-ref.xht
variable-external-supports-01.xht == support/color-green-ref.xht
variable-font-face-01.xht == reference/variable-font-face-01-ref.xht
@@ -103,7 +103,7 @@ variable-reference-34.xht == support/color-green-ref.xht
variable-reference-35.xht == support/color-green-ref.xht
variable-reference-36.xht == reference/variable-reference-36-ref.xht
variable-reference-37.xht == reference/variable-reference-37-ref.xht
-variable-reference-38.xht == reference/variable-declaration-59-ref.xht
+variable-reference-38.xht == reference/variable-reference-38-ref.xht
variable-reference-39.xht == support/color-green-ref.xht
variable-reference-40.xht == reference/variable-reference-40-ref.xht
variable-supports-01.xht == support/color-green-ref.xht
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-external-font-face-01.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-external-font-face-01.xht
index 9811e6fe5d7..b86daf10f7c 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-external-font-face-01.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-external-font-face-01.xht
@@ -5,7 +5,7 @@
--><html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.</title>
<link href="mailto:mihaela.velimiroviciu@softvisioninc.eu" rel="author" title="Mihaela Velimiroviciu" />
<link href="http://www.w3.org/TR/css-variables-1/#defining-variables" rel="help" />
-<link href="reference/variable-font-face-01-ref.xht" rel="match" />
+<link href="reference/variable-external-font-face-01-ref.xht" rel="match" />
<link href="support/external-variable-font-face.css" type="text/css" rel="stylesheet" />
<meta content="ahem" name="flags" />
</head><body><p id="a">This text must not be in Ahem.</p>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-reference-38.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-reference-38.xht
index 8e149f24377..eafcb6bb289 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-reference-38.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1/variable-reference-38.xht
@@ -5,7 +5,7 @@
--><html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: Test using variables in overlapping shorthands.</title>
<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack" />
<link href="http://www.w3.org/TR/css-variables-1/#variables-in-shorthands" rel="help" />
-<link href="reference/variable-declaration-59-ref.xht" rel="match" />
+<link href="reference/variable-reference-38-ref.xht" rel="match" />
<style>
p { padding-left: 1em; }
#a { --style: solid; --left: black dotted; border-style: var(--style); border-left: var(--left); border-top: none; border-right: none; border-bottom: none; }
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-2.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-2.xht
index ce4bed17dc5..e55b81b9aa8 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-2.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-2.xht
@@ -222,7 +222,7 @@
<tr id="variable-external-font-face-01-2" class="primary ahem">
<td><strong>
<a href="variable-external-font-face-01.xht">variable-external-font-face-01</a></strong></td>
- <td><a href="reference/variable-font-face-01-ref.xht">=</a> </td>
+ <td><a href="reference/variable-external-font-face-01-ref.xht">=</a> </td>
<td><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
<td>Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.
</td>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-3.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-3.xht
index 4963837eb6f..429a7818dcd 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-3.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/chapter-3.xht
@@ -686,7 +686,7 @@
<tr id="variable-reference-38-3.2" class="primary">
<td><strong>
<a href="variable-reference-38.xht">variable-reference-38</a></strong></td>
- <td><a href="reference/variable-declaration-59-ref.xht">=</a> </td>
+ <td><a href="reference/variable-reference-38-ref.xht">=</a> </td>
<td></td>
<td>Test using variables in overlapping shorthands.
</td>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-external-font-face-01-ref.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-external-font-face-01-ref.xht
new file mode 100644
index 00000000000..897d72ccbad
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-external-font-face-01-ref.xht
@@ -0,0 +1,11 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Reftest Reference</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack" />
+<link href="support/ahem.css" type="text/css" rel="stylesheet" />
+<meta content="ahem" name="flags" />
+</head><body><p>This text must not be in Ahem.</p>
+<p style="font-family: Ahem">But this text must be in Ahem.</p>
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-reference-38-ref.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-reference-38-ref.xht
new file mode 100644
index 00000000000..5ef35377112
--- /dev/null
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reference/variable-reference-38-ref.xht
@@ -0,0 +1,14 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<!--
+ Any copyright is dedicated to the Public Domain.
+ http://creativecommons.org/publicdomain/zero/1.0/
+--><html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Reftest Reference</title>
+<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack" />
+<style>
+p { padding-left: 1em; }
+#a { border-left: black dotted; }
+#b { border-left: black solid; }
+</style>
+</head><body><p id="a">The left border must be dotted.</p>
+<p id="b">The left border must be solid.</p>
+</body></html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest-toc.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest-toc.xht
index 53d7aa4b7b5..8363b3229e0 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest-toc.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest-toc.xht
@@ -524,7 +524,7 @@
<tr>
<td rowspan="1" title="Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.">
<a href="variable-external-font-face-01.xht">variable-external-font-face-01</a></td>
- <td><a href="reference/variable-font-face-01-ref.xht">=</a> </td>
+ <td><a href="reference/variable-external-font-face-01-ref.xht">=</a> </td>
<td rowspan="1"><abbr class="ahem" title="Requires Ahem font">Ahem</abbr></td>
</tr>
</tbody>
@@ -860,7 +860,7 @@
<tr>
<td rowspan="1" title="Test using variables in overlapping shorthands.">
<a href="variable-reference-38.xht">variable-reference-38</a></td>
- <td><a href="reference/variable-declaration-59-ref.xht">=</a> </td>
+ <td><a href="reference/variable-reference-38-ref.xht">=</a> </td>
<td rowspan="1"></td>
</tr>
</tbody>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest.list b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest.list
index 5062fadb337..cf111f0dab3 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest.list
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/reftest.list
@@ -61,7 +61,7 @@ variable-declaration-58.xht == support/color-green-ref.xht
variable-declaration-59.xht == support/color-green-ref.xht
variable-declaration-60.xht == support/color-green-ref.xht
variable-external-declaration-01.xht == support/color-green-ref.xht
-variable-external-font-face-01.xht == reference/variable-font-face-01-ref.xht
+variable-external-font-face-01.xht == reference/variable-external-font-face-01-ref.xht
variable-external-reference-01.xht == support/color-green-ref.xht
variable-external-supports-01.xht == support/color-green-ref.xht
variable-font-face-01.xht == reference/variable-font-face-01-ref.xht
@@ -103,7 +103,7 @@ variable-reference-34.xht == support/color-green-ref.xht
variable-reference-35.xht == support/color-green-ref.xht
variable-reference-36.xht == reference/variable-reference-36-ref.xht
variable-reference-37.xht == reference/variable-reference-37-ref.xht
-variable-reference-38.xht == reference/variable-declaration-59-ref.xht
+variable-reference-38.xht == reference/variable-reference-38-ref.xht
variable-reference-39.xht == support/color-green-ref.xht
variable-reference-40.xht == reference/variable-reference-40-ref.xht
variable-supports-01.xht == support/color-green-ref.xht
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-external-font-face-01.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-external-font-face-01.xht
index 9811e6fe5d7..b86daf10f7c 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-external-font-face-01.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-external-font-face-01.xht
@@ -5,7 +5,7 @@
--><html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: Test the invalid declaration and use of a variable in an @font-face rule within an external CSS.</title>
<link href="mailto:mihaela.velimiroviciu@softvisioninc.eu" rel="author" title="Mihaela Velimiroviciu" />
<link href="http://www.w3.org/TR/css-variables-1/#defining-variables" rel="help" />
-<link href="reference/variable-font-face-01-ref.xht" rel="match" />
+<link href="reference/variable-external-font-face-01-ref.xht" rel="match" />
<link href="support/external-variable-font-face.css" type="text/css" rel="stylesheet" />
<meta content="ahem" name="flags" />
</head><body><p id="a">This text must not be in Ahem.</p>
diff --git a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-reference-38.xht b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-reference-38.xht
index 8e149f24377..eafcb6bb289 100644
--- a/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-reference-38.xht
+++ b/tests/wpt/css-tests/css-variables-1_dev/xhtml1print/variable-reference-38.xht
@@ -5,7 +5,7 @@
--><html xmlns="http://www.w3.org/1999/xhtml"><head><title>CSS Test: Test using variables in overlapping shorthands.</title>
<link href="mailto:cam@mcc.id.au" rel="author" title="Cameron McCormack" />
<link href="http://www.w3.org/TR/css-variables-1/#variables-in-shorthands" rel="help" />
-<link href="reference/variable-declaration-59-ref.xht" rel="match" />
+<link href="reference/variable-reference-38-ref.xht" rel="match" />
<style>
p { padding-left: 1em; }
#a { --style: solid; --left: black dotted; border-style: var(--style); border-left: var(--left); border-top: none; border-right: none; border-bottom: none; }