Stop skipping css-variables tests in layout-2020

14 files changed, 129 insertions, 80 deletions

diff --git a/tests/wpt/include-layout-2020.ini b/tests/wpt/include-layout-2020.ini
index 29ff07e3eab..a77b7a6f2a7 100644
--- a/tests/wpt/include-layout-2020.ini
+++ b/tests/wpt/include-layout-2020.ini
@@ -32,6 +32,8 @@ skip: true
     skip: false
   [css-ui]
     skip: false
+  [css-variables]
+    skip: false
   [cssom]
     skip: false
   [cssom-view]
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/css-variable-change-style-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/css-variable-change-style-001.html.ini
deleted file mode 100644
index 443089ea5e2..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-variables/css-variable-change-style-001.html.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[css-variable-change-style-001.html]
-  [Test changing 'color' value to become a css variable]
-    expected: FAIL
-
-  [Test declaration changes on 'color' as variable]
-    expected: FAIL
-
-  [Avoid masking differences on 'color' due to declaration changes]
-    expected: FAIL
-
-  [Test declaration changes on 'white-space' as variable]
-    expected: FAIL
-
-  [Test declaration changes on 'background-color' as variable]
-    expected: FAIL
-
-  [Test changing 'white-space' value to become a css variable]
-    expected: FAIL
-
-  [Test changing 'background-color' value to become a css variable]
-    expected: FAIL
-
-  [Avoid masking differences on 'background-color' due to declaration changes]
-    expected: FAIL
-
-  [Avoid masking differences on 'white-space' due to declaration changes]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/css-variable-change-style-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/css-variable-change-style-002.html.ini
deleted file mode 100644
index 5781474a926..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-variables/css-variable-change-style-002.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[css-variable-change-style-002.html]
-  [Declaration changes on 'color' propagate to all variable references]
-    expected: FAIL
-
-  [Declaration changes on 'background-color' propagate to all variable references]
-    expected: FAIL
-
-  [Declaration changes on 'white-space' propagate to all variable references]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-from-to.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-from-to.html.ini
new file mode 100644
index 00000000000..ac3f2998e7f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-from-to.html.ini
@@ -0,0 +1,15 @@
+[variable-animation-from-to.html]
+  bug: https://github.com/servo/servo/issues/26625
+  expected: TIMEOUT
+  [Verify CSS variable value before animation]
+    expected: FAIL
+
+  [Verify substituted color value before animation]
+    expected: FAIL
+
+  [Verify CSS variable value after animation]
+    expected: NOTRUN
+
+  [Verify substituted color value after animation]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-over-transition.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-over-transition.html.ini
new file mode 100644
index 00000000000..6544dd3874e
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-over-transition.html.ini
@@ -0,0 +1,15 @@
+[variable-animation-over-transition.html]
+  bug: https://github.com/servo/servo/issues/26625
+  expected: TIMEOUT
+  [Verify CSS variable value before animation]
+    expected: FAIL
+
+  [Verify substituted color value before animation]
+    expected: FAIL
+
+  [Verify CSS variable value after animation]
+    expected: NOTRUN
+
+  [Verify substituted color value after animation]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-substitute-into-keyframe-transform.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-substitute-into-keyframe-transform.html.ini
new file mode 100644
index 00000000000..4722727d208
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-substitute-into-keyframe-transform.html.ini
@@ -0,0 +1,8 @@
+[variable-animation-substitute-into-keyframe-transform.html]
+  bug: https://github.com/servo/servo/issues/26625
+  [Verify transform before animation]
+    expected: FAIL
+
+  [Verify transform after animation]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-to-only.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-to-only.html.ini
new file mode 100644
index 00000000000..976008b1d68
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variable-animation-to-only.html.ini
@@ -0,0 +1,6 @@
+[variable-animation-to-only.html]
+  bug: https://github.com/servo/servo/issues/26625
+  expected: TIMEOUT
+  [Verify CSS variable value after animation]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variable-cycles.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variable-cycles.html.ini
deleted file mode 100644
index 0cfacb1028b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/css-variables/variable-cycles.html.ini
+++ /dev/null
@@ -1,33 +0,0 @@
-[variable-cycles.html]
-  [Self-cycle]
-    expected: FAIL
-
-  [Simple a/b cycle]
-    expected: FAIL
-
-  [Three-var cycle]
-    expected: FAIL
-
-  [Cycle that starts in the middle of a chain]
-    expected: FAIL
-
-  [Cycle with extra edge]
-    expected: FAIL
-
-  [Cycle with extra edge (2)]
-    expected: FAIL
-
-  [Cycle with extra edge (3)]
-    expected: FAIL
-
-  [Cycle with secondary cycle]
-    expected: FAIL
-
-  [Cycle with overlapping secondary cycle]
-    expected: FAIL
-
-  [Cycle with deeper secondary cycle]
-    expected: FAIL
-
-  [Cycle via fallback]
-    expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variable-definition.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variable-definition.html.ini
index 06b3e7cfc70..a3daa11079d 100644
--- a/tests/wpt/metadata-layout-2020/css/css-variables/variable-definition.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variable-definition.html.ini
@@ -1,4 +1,10 @@
 [variable-definition.html]
+  [CSSOM.setProperty with space 1]
+    expected: FAIL
+
+  [CSSOM.setProperty with space 2]
+    expected: FAIL
+
   [no char variable]
     expected: FAIL
 
@@ -62,17 +68,47 @@
   [ leading white space (double space) 2 (Cascading)]
     expected: FAIL
 
-  [CSSOM.setProperty with space 1]
+  [can overwrite with no value]
     expected: FAIL
 
-  [CSSOM.setProperty with space 2]
+  [can overwrite with no value (Computed Style)]
     expected: FAIL
 
-  [can overwrite with no value]
+  [can overwrite with no value (Cascading)]
     expected: FAIL
 
-  [can overwrite with no value (Computed Style)]
+  [ trailing white space (single space)]
     expected: FAIL
 
-  [can overwrite with no value (Cascading)]
+  [ trailing white space (double space) 2]
+    expected: FAIL
+
+  [!important]
+    expected: FAIL
+
+  [!important (with space)]
+    expected: FAIL
+
+  [ trailing white space (single space) (Computed Style)]
+    expected: FAIL
+
+  [ trailing white space (double space) 2 (Computed Style)]
+    expected: FAIL
+
+  [!important (Computed Style)]
+    expected: FAIL
+
+  [!important (with space) (Computed Style)]
+    expected: FAIL
+
+  [ trailing white space (single space) (Cascading)]
+    expected: FAIL
+
+  [ trailing white space (double space) 2 (Cascading)]
+    expected: FAIL
+
+  [!important (Cascading)]
+    expected: FAIL
+
+  [!important (with space) (Cascading)]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variable-first-letter.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variable-first-letter.html.ini
new file mode 100644
index 00000000000..a058a34b9b4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variable-first-letter.html.ini
@@ -0,0 +1,13 @@
+[variable-first-letter.html]
+  [color]
+    expected: FAIL
+
+  [font-size]
+    expected: FAIL
+
+  [font-weight]
+    expected: FAIL
+
+  [nested color]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variable-first-line.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variable-first-line.html.ini
new file mode 100644
index 00000000000..50a8fa83a5d
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variable-first-line.html.ini
@@ -0,0 +1,13 @@
+[variable-first-line.html]
+  [color]
+    expected: FAIL
+
+  [font-size]
+    expected: FAIL
+
+  [font-weight]
+    expected: FAIL
+
+  [nested color]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variable-invalidation.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variable-invalidation.html.ini
new file mode 100644
index 00000000000..7daf62425b1
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variable-invalidation.html.ini
@@ -0,0 +1,13 @@
+[variable-invalidation.html]
+  [css rule test]
+    expected: FAIL
+
+  [css rule test important]
+    expected: FAIL
+
+  [inline style test]
+    expected: FAIL
+
+  [inline style test important]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variable-reference-without-whitespace.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variable-reference-without-whitespace.html.ini
new file mode 100644
index 00000000000..c89001046de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variable-reference-without-whitespace.html.ini
@@ -0,0 +1,3 @@
+[variable-reference-without-whitespace.html]
+  type: reftest
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-variables/variables-substitute-guaranteed-invalid.html.ini b/tests/wpt/metadata-layout-2020/css/css-variables/variables-substitute-guaranteed-invalid.html.ini
index bb401d84139..46514359b87 100644
--- a/tests/wpt/metadata-layout-2020/css/css-variables/variables-substitute-guaranteed-invalid.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-variables/variables-substitute-guaranteed-invalid.html.ini
@@ -8,12 +8,8 @@
   [A custom property referencing a non-existent variable is treated as unset]
     expected: FAIL
 
-  [Custom properties in a cycle become guaranteed-invalid]
-    expected: FAIL
-
   [A custom property referencing a cycle becomes guaranteed-invalid]
     expected: FAIL
 
   [A custom property referencing a non-existent variable becomes guaranteed-invalid]
     expected: FAIL
-