tests/data: mark non-XML-compliant files as such, xmllint the rest in CI

There are 58 non-compliant files. Mark them with the `notxml` keyword. Also include the compliant ones in the GHA/checksrc xmllint CI job. Also: - delete XML prolog from the 3 test data files that had them. - FILEFORMAT.md: document the `notxml` keyword. - FILEFORMAT.md: fix a typo. Follow-up to de49cc89ab #19470 Follow-up to f3095f0dbd #19528 Follow-up to 87ba80a6df Closes #19595
2026-08-25 17:03:31 +03:00 · 2025-11-18 19:10:53 +01:00 · 2025-11-18 19:10:53 +01:00 · 7f3731ce14
commit 7f3731ce14
parent 36d0f12881
64 changed files with 71 additions and 5 deletions
--- a/.github/scripts/pyspelling.words
+++ b/.github/scripts/pyspelling.words
@ -463,6 +463,7 @@ libWebSocket
 libz
 libzstd
 LineageOS
+linter
 linux
 lldb
 ln
@ -981,6 +982,7 @@ Xbox
 XDG
 xdigit
 Xilinx
+xmllint
 XP
 Xtensa
 XYZ
--- a/.github/workflows/checksrc.yml
+++ b/.github/workflows/checksrc.yml
@ -128,7 +128,11 @@ jobs:
          persist-credentials: false

      - name: 'check'
-        run: git grep -z -i -l -E '^<\?xml' | xargs -0 -r xmllint >/dev/null
+        run: |
+          {
+            git grep -z -i -l -E '^<\?xml' || true
+            git grep -z -L -F 'notxml' 'tests/data/test*' || true
+          } | xargs -0 -r xmllint >/dev/null

  miscchecks:
    name: 'misc checks'
--- a/docs/tests/FILEFORMAT.md
+++ b/docs/tests/FILEFORMAT.md
@ -239,7 +239,7 @@ When running a unit test and the keywords include `unittest`, the `<tool>`
 section can be left empty to use the standard unit test tool name `unitN` where
 `N` is the test number.

-The `text-ci` make target automatically skips test with the `flaky` keyword.
+The `test-ci` make target automatically skips test with the `flaky` keyword.

 Tests that have strict timing dependencies have the `timing-dependent` keyword.
 These are intended to eventually be treated specially on CI builds which are
@ -248,6 +248,11 @@ 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.
+
 ## `<reply>`

 ### `<data [nocheck="yes"] [sendzero="yes"] [hex="yes"] [nonewline="yes"] [crlf="yes|headers"]>`
--- a/tests/data/test1011
+++ b/tests/data/test1011
@ -4,6 +4,7 @@
 HTTP
 HTTP POST
 followlocation
+notxml
 </keywords>
 </info>
 #
--- a/tests/data/test1012
+++ b/tests/data/test1012
@ -4,6 +4,7 @@
 HTTP
 HTTP POST
 followlocation
+notxml
 </keywords>
 </info>
 #
--- a/tests/data/test1015
+++ b/tests/data/test1015
@ -4,6 +4,7 @@
 HTTP
 HTTP POST
 --data-urlencode
+notxml
 </keywords>
 </info>

--- a/tests/data/test1034
+++ b/tests/data/test1034
@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="US-ASCII"?>
 <testcase>
 <info>
 <keywords>
--- a/tests/data/test1076
+++ b/tests/data/test1076
@ -4,6 +4,7 @@
 HTTP
 HTTP POST
 followlocation
+notxml
 </keywords>
 </info>
 #
--- a/tests/data/test1105
+++ b/tests/data/test1105
@ -5,6 +5,7 @@ HTTP
 HTTP POST
 cookies
 cookiejar
+notxml
 </keywords>
 </info>

--- a/tests/data/test1138
+++ b/tests/data/test1138
@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 followlocation
+notxml
 </keywords>
 </info>
 #
--- a/tests/data/test1158
+++ b/tests/data/test1158
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP FORMPOST
+notxml
 </keywords>
 </info>
 # Server-side
--- a/tests/data/test1160
+++ b/tests/data/test1160
@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="US-ASCII"?>
 <testcase>
 <info>
 <keywords>
--- a/tests/data/test1186
+++ b/tests/data/test1186
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP FORMPOST
+notxml
 </keywords>
 </info>
 # Server-side
--- a/tests/data/test1189
+++ b/tests/data/test1189
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP FORMPOST
+notxml
 </keywords>
 </info>
 # Server-side
--- a/tests/data/test1221
+++ b/tests/data/test1221
@ -5,6 +5,7 @@ HTTP
 HTTP POST
 --data-urlencode
 --url-query
+notxml
 </keywords>
 </info>

--- a/tests/data/test1332
+++ b/tests/data/test1332
@ -5,6 +5,7 @@
 HTTP
 HTTP POST
 followlocation
+notxml
 </keywords>
 </info>
 #
--- a/tests/data/test1400
+++ b/tests/data/test1400
@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 --libcurl
+notxml
 </keywords>
 </info>

--- a/tests/data/test1401
+++ b/tests/data/test1401
@ -7,6 +7,7 @@ HTTP Basic auth
 HTTP set cookie
 cookies
 --libcurl
+notxml
 </keywords>
 </info>

--- a/tests/data/test1402
+++ b/tests/data/test1402
@ -4,6 +4,7 @@
 HTTP
 HTTP POST
 --libcurl
+notxml
 </keywords>
 </info>

--- a/tests/data/test1403
+++ b/tests/data/test1403
@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 --libcurl
+notxml
 </keywords>
 </info>

--- a/tests/data/test1404
+++ b/tests/data/test1404
@ -6,6 +6,7 @@ HTTP
 HTTP FORMPOST
 HTTP file upload
 --libcurl
+notxml
 </keywords>
 </info>

--- a/tests/data/test1405
+++ b/tests/data/test1405
@ -6,6 +6,7 @@ FTP
 post-quote
 pre-quote
 --libcurl
+notxml
 </keywords>
 </info>
 # Server-side
--- a/tests/data/test1406
+++ b/tests/data/test1406
@ -5,6 +5,7 @@
 <keywords>
 SMTP
 --libcurl
+notxml
 </keywords>
 </info>

--- a/tests/data/test1407
+++ b/tests/data/test1407
@ -6,6 +6,7 @@ POP3
 Clear Text
 LIST
 --libcurl
+notxml
 </keywords>
 </info>

--- a/tests/data/test1420
+++ b/tests/data/test1420
@ -6,6 +6,7 @@ IMAP
 Clear Text
 FETCH
 --libcurl
+notxml
 </keywords>
 </info>

--- a/tests/data/test1445
+++ b/tests/data/test1445
@ -3,6 +3,7 @@
 <keywords>
 FILE
 --remote-time
+notxml
 </keywords>
 </info>

--- a/tests/data/test1446
+++ b/tests/data/test1446
@ -3,6 +3,7 @@
 <keywords>
 SFTP
 --remote-time
+notxml
 </keywords>
 </info>

--- a/tests/data/test1461
+++ b/tests/data/test1461
@ -2,6 +2,7 @@
 <info>
 <keywords>
 --help
+notxml
 </keywords>
 </info>

--- a/tests/data/test1463
+++ b/tests/data/test1463
@ -3,6 +3,7 @@
 <keywords>
 FILE
 --help
+notxml
 </keywords>
 </info>

--- a/tests/data/test1464
+++ b/tests/data/test1464
@ -3,6 +3,7 @@
 <keywords>
 FILE
 --help
+notxml
 </keywords>
 </info>

--- a/tests/data/test1465
+++ b/tests/data/test1465
@ -4,6 +4,7 @@
 HTTP
 HTTP POST
 --libcurl
+notxml
 </keywords>
 </info>

--- a/tests/data/test1481
+++ b/tests/data/test1481
@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 --libcurl
+notxml
 </keywords>
 </info>

--- a/tests/data/test1506
+++ b/tests/data/test1506
@ -4,6 +4,7 @@
 HTTP
 multi
 verbose logs
+notxml
 </keywords>
 </info>

--- a/tests/data/test1510
+++ b/tests/data/test1510
@ -4,6 +4,7 @@
 HTTP
 verbose logs
 flaky
+notxml
 </keywords>
 </info>

--- a/tests/data/test1512
+++ b/tests/data/test1512
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 GLOBAL DNS CACHE
+notxml
 </keywords>
 </info>

--- a/tests/data/test1524
+++ b/tests/data/test1524
@ -4,6 +4,7 @@
 HTTP
 HTTP PUT
 followlocation
+notxml
 </keywords>
 </info>
 #
--- a/tests/data/test1542
+++ b/tests/data/test1542
@ -6,6 +6,7 @@ connection reuse
 persistent connection
 CURLOPT_MAXLIFETIME_CONN
 verbose logs
+notxml
 </keywords>
 </info>

--- a/tests/data/test1598
+++ b/tests/data/test1598
@ -5,6 +5,7 @@ HTTP
 HTTP POST
 CURLOPT_HTTPTRAILER_FUNCTION
 CURLOPT_HTTPTRAILER_DATA
+notxml
 </keywords>
 </info>

--- a/tests/data/test163
+++ b/tests/data/test163
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP POST
+notxml
 </keywords>
 </info>

--- a/tests/data/test1683
+++ b/tests/data/test1683
@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 --no-clobber
+notxml
 </keywords>
 </info>

--- a/tests/data/test1705
+++ b/tests/data/test1705
@ -4,6 +4,7 @@
 script
 documentation
 managen
+notxml
 </keywords>
 </info>

--- a/tests/data/test1706
+++ b/tests/data/test1706
@ -4,6 +4,7 @@
 script
 documentation
 managen
+notxml
 </keywords>
 </info>

--- a/tests/data/test1977
+++ b/tests/data/test1977
@ -3,6 +3,7 @@
 <keywords>
 CURLOPT_CURLU
 CURLINFO_EFFECTIVE_URL
+notxml
 </keywords>
 </info>

--- a/tests/data/test199
+++ b/tests/data/test199
@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 globbing
+notxml
 </keywords>
 </info>
 #
--- a/tests/data/test2402
+++ b/tests/data/test2402
@ -5,6 +5,7 @@ HTTP
 HTTP/2
 multi
 verbose logs
+notxml
 </keywords>
 </info>

--- a/tests/data/test2404
+++ b/tests/data/test2404
@ -5,6 +5,7 @@ HTTP
 HTTP/2
 multi
 verbose logs
+notxml
 </keywords>
 </info>

--- a/tests/data/test2502
+++ b/tests/data/test2502
@ -5,6 +5,7 @@ HTTP
 HTTP/3
 multi
 verbose logs
+notxml
 </keywords>
 </info>

--- a/tests/data/test3
+++ b/tests/data/test3
@ -4,6 +4,7 @@
 HTTP
 HTTP POST
 HTTP Basic auth
+notxml
 </keywords>
 </info>
 #
--- a/tests/data/test32
+++ b/tests/data/test32
@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 -G
+notxml
 </keywords>
 </info>
 #
--- a/tests/data/test320
+++ b/tests/data/test320
@ -4,6 +4,7 @@
 HTTPS
 HTTP GET
 TLS-SRP
+notxml
 </keywords>
 </info>

--- a/tests/data/test39
+++ b/tests/data/test39
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 HTTP FORMPOST
+notxml
 </keywords>
 </info>
 # Server-side
--- a/tests/data/test40
+++ b/tests/data/test40
@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 followlocation
+notxml
 </keywords>
 </info>
 #
--- a/tests/data/test439
+++ b/tests/data/test439
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 aws-sigv4
+notxml
 </keywords>
 </info>

--- a/tests/data/test446
+++ b/tests/data/test446
@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="US-ASCII"?>
 <testcase>
 <info>
 <keywords>
--- a/tests/data/test45
+++ b/tests/data/test45
@ -4,6 +4,7 @@
 HTTP
 HTTP GET
 followlocation
+notxml
 </keywords>
 </info>
 # Server-side
--- a/tests/data/test48
+++ b/tests/data/test48
@ -4,6 +4,7 @@
 HTTP
 HTTP HEAD
 -G
+notxml
 </keywords>
 </info>
 #
--- a/tests/data/test568
+++ b/tests/data/test568
@ -5,6 +5,7 @@
 <keywords>
 RTSP
 ANNOUNCE
+notxml
 </keywords>
 </info>

--- a/tests/data/test646
+++ b/tests/data/test646
@ -3,6 +3,7 @@
 <keywords>
 SMTP
 MULTIPART
+notxml
 </keywords>
 </info>

--- a/tests/data/test733
+++ b/tests/data/test733
@ -2,6 +2,7 @@
 <info>
 <keywords>
 IPFS
+notxml
 </keywords>
 </info>

--- a/tests/data/test734
+++ b/tests/data/test734
@ -2,6 +2,7 @@
 <info>
 <keywords>
 IPFS
+notxml
 </keywords>
 </info>

--- a/tests/data/test735
+++ b/tests/data/test735
@ -2,6 +2,7 @@
 <info>
 <keywords>
 IPFS
+notxml
 </keywords>
 </info>

--- a/tests/data/test739
+++ b/tests/data/test739
@ -2,6 +2,7 @@
 <info>
 <keywords>
 IPFS
+notxml
 </keywords>
 </info>

--- a/tests/data/test787
+++ b/tests/data/test787
@ -3,6 +3,7 @@
 <keywords>
 HTTP
 --variable
+notxml
 </keywords>
 </info>

--- a/tests/data/test96
+++ b/tests/data/test96
@ -2,6 +2,7 @@
 <info>
 <keywords>
 TrackMemory
+notxml
 </keywords>
 </info>