diff options
| author | Ms2ger <Ms2ger@gmail.com> | 2015-08-21 17:46:44 +0200 |
|---|---|---|
| committer | Ms2ger <Ms2ger@gmail.com> | 2015-08-21 18:40:37 +0200 |
| commit | f235d49372ba86d6d01530fe1b9ebdf8bea74468 (patch) | |
| tree | 13d3535ee53fcae1b8d61265e3d97adb00dd60eb /tests/wpt/css-tests/css-variables-1_dev/xhtml1 | |
| parent | 7c45ff8e05a6ebd21f9aa5c360e997a01d48b1fc (diff) | |
| download | servo-f235d49372ba86d6d01530fe1b9ebdf8bea74468.tar.gz servo-f235d49372ba86d6d01530fe1b9ebdf8bea74468.zip | |
Update CSS tests to revision d674587d6ae7d2e231d632785559f2613d554eb0
Diffstat (limited to 'tests/wpt/css-tests/css-variables-1_dev/xhtml1')
8 files changed, 33 insertions, 8 deletions
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; } |