From bfe6eb1c06f295a45c4d2c9c7aa8f09895706313 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Wed, 10 Dec 2025 23:44:43 +0100 Subject: [PATCH] runtests: drop `notxml` keyword, verify all test data files as XML Follow-up to 7f3731ce142c1d74023abad183cc8ce0fd527fab #19595 Closes #19927 --- .github/workflows/checksrc.yml | 4 ++-- docs/tests/FILEFORMAT.md | 5 ----- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/checksrc.yml b/.github/workflows/checksrc.yml index 1b471e50cf..8552ad4c79 100644 --- a/.github/workflows/checksrc.yml +++ b/.github/workflows/checksrc.yml @@ -139,8 +139,8 @@ jobs: - name: 'check' run: | { - git grep -z -i -l -E '^<\?xml' || true - git grep -z -L -F 'notxml' 'tests/data/test*' || true + git grep -i -l -E '^<\?xml' -z || true + git ls-files 'tests/data/test*' -z || true } | xargs -0 -r xmllint >/dev/null miscchecks: diff --git a/docs/tests/FILEFORMAT.md b/docs/tests/FILEFORMAT.md index c655a4d863..84188e9dd9 100644 --- a/docs/tests/FILEFORMAT.md +++ b/docs/tests/FILEFORMAT.md @@ -257,11 +257,6 @@ often run on overloaded machines with unpredictable timing. Tests using non-7-bit-ASCII characters must provide them with `%hex[]` or similar. -In most cases test files comply with the XML format, and pass xmllint cleanly. -If the data file uses the `&` character, or has other, non-compliant content, -and making it XML-compliant is not possible or unpractical, use the `notxml` -keyword to exclude it from linter checks. - ## `` ### `` -- 2.47.3