From 8f3e1bcabea3e16bc2721f4de5ee867fc1ba201b Mon Sep 17 00:00:00 2001 From: Mukilan Thiyagarajan Date: Tue, 5 Mar 2024 16:26:18 +0530 Subject: [PATCH] Enable `css-text` explicitly in include.ini (#31502) * Enable `css-text` explicitly in include.ini The WPT test runner has some strange logic for determining the key's value for a node like `[css]` or `[css-text]`. In this logic, if the node doesn't have an explicit value for a key (here `skip`), then the implicit root node's setting (i.e key/value pair at the top of the file that is not nested under a heading) is used as the default fallback value [1]. Only when the implicit root node doesn't have an explicit value set does the logic starts looking at the current node's parent [2]. In our case, in `include.ini` the default value for `skip` is `true` as that is the first line in the file. Since `[css-text]` doesn't have `skip` set explicitly, the default value of `true` is used even though the parent's value is `false`. [1]: https://github.com/servo/servo/blob/2bafcf9f182bf907c4a4391f931a7364bd7b804f/tests/wpt/tests/tools/wptrunner/wptrunner/wptmanifest/backends/conditional.py#L265 [2]: https://github.com/servo/servo/blob/2bafcf9f182bf907c4a4391f931a7364bd7b804f/tests/wpt/tests/tools/wptrunner/wptrunner/manifestinclude.py#L59 Signed-off-by: Mukilan Thiyagarajan * Update text expectations --------- Signed-off-by: Mukilan Thiyagarajan Co-authored-by: Oriol Brufau --- tests/wpt/include.ini | 1 + .../letter-spacing-percent-001.html.ini | 2 ++ .../parsing/letter-spacing-computed.html.ini | 11 +++++++++++ .../css-text/parsing/letter-spacing-valid.html.ini | 12 ++++++++++++ .../css-text/word-spacing/word-spacing-002.html.ini | 2 ++ .../word-spacing/word-spacing-percent-001.html.ini | 2 ++ .../letter-spacing-percent-001.html.ini | 2 ++ .../parsing/letter-spacing-computed.html.ini | 12 ++++++++++++ .../css-text/parsing/letter-spacing-valid.html.ini | 12 ++++++++++++ .../css-text/word-spacing/word-spacing-002.html.ini | 2 ++ .../word-spacing/word-spacing-percent-001.html.ini | 2 ++ 11 files changed, 60 insertions(+) create mode 100644 tests/wpt/meta-legacy-layout/css/css-text/letter-spacing/letter-spacing-percent-001.html.ini create mode 100644 tests/wpt/meta-legacy-layout/css/css-text/parsing/letter-spacing-valid.html.ini create mode 100644 tests/wpt/meta-legacy-layout/css/css-text/word-spacing/word-spacing-002.html.ini create mode 100644 tests/wpt/meta-legacy-layout/css/css-text/word-spacing/word-spacing-percent-001.html.ini create mode 100644 tests/wpt/meta/css/css-text/letter-spacing/letter-spacing-percent-001.html.ini create mode 100644 tests/wpt/meta/css/css-text/parsing/letter-spacing-computed.html.ini create mode 100644 tests/wpt/meta/css/css-text/parsing/letter-spacing-valid.html.ini create mode 100644 tests/wpt/meta/css/css-text/word-spacing/word-spacing-002.html.ini create mode 100644 tests/wpt/meta/css/css-text/word-spacing/word-spacing-percent-001.html.ini diff --git a/tests/wpt/include.ini b/tests/wpt/include.ini index 32eb103eabe..7c891a5dcbe 100644 --- a/tests/wpt/include.ini +++ b/tests/wpt/include.ini @@ -94,6 +94,7 @@ skip: true [css-speech] skip: true [css-text] + skip: false [i18n] skip: true [css-typed-om] diff --git a/tests/wpt/meta-legacy-layout/css/css-text/letter-spacing/letter-spacing-percent-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/letter-spacing/letter-spacing-percent-001.html.ini new file mode 100644 index 00000000000..90c80182ad9 --- /dev/null +++ b/tests/wpt/meta-legacy-layout/css/css-text/letter-spacing/letter-spacing-percent-001.html.ini @@ -0,0 +1,2 @@ +[letter-spacing-percent-001.html] + expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/letter-spacing-computed.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/letter-spacing-computed.html.ini index 6828569d1c0..c7743b06041 100644 --- a/tests/wpt/meta-legacy-layout/css/css-text/parsing/letter-spacing-computed.html.ini +++ b/tests/wpt/meta-legacy-layout/css/css-text/parsing/letter-spacing-computed.html.ini @@ -2,3 +2,14 @@ [Property letter-spacing value 'normal' computes to '0px'] expected: FAIL + [Property letter-spacing value '110%'] + expected: FAIL + + [Property letter-spacing value '-5%'] + expected: FAIL + + [Property letter-spacing value 'calc(10% - 20%)'] + expected: FAIL + + [Property letter-spacing value 'calc(10px - (5% + 10%)'] + expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-text/parsing/letter-spacing-valid.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/parsing/letter-spacing-valid.html.ini new file mode 100644 index 00000000000..f7411a6f2c5 --- /dev/null +++ b/tests/wpt/meta-legacy-layout/css/css-text/parsing/letter-spacing-valid.html.ini @@ -0,0 +1,12 @@ +[letter-spacing-valid.html] + [e.style['letter-spacing'\] = "120%" should set the property value] + expected: FAIL + + [e.style['letter-spacing'\] = "-10%" should set the property value] + expected: FAIL + + [e.style['letter-spacing'\] = "calc(2ch - 30%)" should set the property value] + expected: FAIL + + [e.style['letter-spacing'\] = "calc(40% + 50px)" should set the property value] + expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-spacing/word-spacing-002.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-spacing/word-spacing-002.html.ini new file mode 100644 index 00000000000..8c45b2ab5ea --- /dev/null +++ b/tests/wpt/meta-legacy-layout/css/css-text/word-spacing/word-spacing-002.html.ini @@ -0,0 +1,2 @@ +[word-spacing-002.html] + expected: FAIL diff --git a/tests/wpt/meta-legacy-layout/css/css-text/word-spacing/word-spacing-percent-001.html.ini b/tests/wpt/meta-legacy-layout/css/css-text/word-spacing/word-spacing-percent-001.html.ini new file mode 100644 index 00000000000..5ab4d45dd9e --- /dev/null +++ b/tests/wpt/meta-legacy-layout/css/css-text/word-spacing/word-spacing-percent-001.html.ini @@ -0,0 +1,2 @@ +[word-spacing-percent-001.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text/letter-spacing/letter-spacing-percent-001.html.ini b/tests/wpt/meta/css/css-text/letter-spacing/letter-spacing-percent-001.html.ini new file mode 100644 index 00000000000..90c80182ad9 --- /dev/null +++ b/tests/wpt/meta/css/css-text/letter-spacing/letter-spacing-percent-001.html.ini @@ -0,0 +1,2 @@ +[letter-spacing-percent-001.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text/parsing/letter-spacing-computed.html.ini b/tests/wpt/meta/css/css-text/parsing/letter-spacing-computed.html.ini new file mode 100644 index 00000000000..342b85d13fe --- /dev/null +++ b/tests/wpt/meta/css/css-text/parsing/letter-spacing-computed.html.ini @@ -0,0 +1,12 @@ +[letter-spacing-computed.html] + [Property letter-spacing value '110%'] + expected: FAIL + + [Property letter-spacing value '-5%'] + expected: FAIL + + [Property letter-spacing value 'calc(10% - 20%)'] + expected: FAIL + + [Property letter-spacing value 'calc(10px - (5% + 10%)'] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text/parsing/letter-spacing-valid.html.ini b/tests/wpt/meta/css/css-text/parsing/letter-spacing-valid.html.ini new file mode 100644 index 00000000000..f7411a6f2c5 --- /dev/null +++ b/tests/wpt/meta/css/css-text/parsing/letter-spacing-valid.html.ini @@ -0,0 +1,12 @@ +[letter-spacing-valid.html] + [e.style['letter-spacing'\] = "120%" should set the property value] + expected: FAIL + + [e.style['letter-spacing'\] = "-10%" should set the property value] + expected: FAIL + + [e.style['letter-spacing'\] = "calc(2ch - 30%)" should set the property value] + expected: FAIL + + [e.style['letter-spacing'\] = "calc(40% + 50px)" should set the property value] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text/word-spacing/word-spacing-002.html.ini b/tests/wpt/meta/css/css-text/word-spacing/word-spacing-002.html.ini new file mode 100644 index 00000000000..8c45b2ab5ea --- /dev/null +++ b/tests/wpt/meta/css/css-text/word-spacing/word-spacing-002.html.ini @@ -0,0 +1,2 @@ +[word-spacing-002.html] + expected: FAIL diff --git a/tests/wpt/meta/css/css-text/word-spacing/word-spacing-percent-001.html.ini b/tests/wpt/meta/css/css-text/word-spacing/word-spacing-percent-001.html.ini new file mode 100644 index 00000000000..5ab4d45dd9e --- /dev/null +++ b/tests/wpt/meta/css/css-text/word-spacing/word-spacing-percent-001.html.ini @@ -0,0 +1,2 @@ +[word-spacing-percent-001.html] + expected: FAIL