tests/data: replace Perl && with and for XML-compliance

Bringing down non-XML-compliant files to 50 (from 58).

Follow-up to 7f3731ce14 #19595

Closes #19765
This commit is contained in:
Viktor Szakats 2025-11-30 01:26:56 +01:00
parent 47a1ab2ebe
commit 6d156bc05f
No known key found for this signature in database
GPG key ID: B5ABD165E2AEF201
8 changed files with 8 additions and 16 deletions

View file

@ -4,7 +4,6 @@
HTTP
multi
verbose logs
notxml
</keywords>
</info>
@ -93,7 +92,7 @@ Accept: */*
* Connection #3 to host server4.example.com:%HTTPPORT left intact
</file>
<stripfile>
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /Closing connection/))
$_ = '' if(($_ !~ /left intact/) and ($_ !~ /Closing connection/))
</stripfile>
</verify>
</testcase>

View file

@ -4,7 +4,6 @@
HTTP
verbose logs
flaky
notxml
</keywords>
</info>
@ -90,7 +89,7 @@ Accept: */*
* Connection #3 to host server4.example.com:%HTTPPORT left intact
</file>
<stripfile>
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /Closing connection/))
$_ = '' if(($_ !~ /left intact/) and ($_ !~ /Closing connection/))
</stripfile>
</verify>
</testcase>

View file

@ -3,7 +3,6 @@
<keywords>
HTTP
GLOBAL DNS CACHE
notxml
</keywords>
</info>
@ -75,7 +74,7 @@ Accept: */*
^Host:.*
</strip>
<stripfile>
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /Closing connection/))
$_ = '' if(($_ !~ /left intact/) and ($_ !~ /Closing connection/))
</stripfile>
</verify>
</testcase>

View file

@ -6,7 +6,6 @@ connection reuse
persistent connection
CURLOPT_MAXLIFETIME_CONN
verbose logs
notxml
</keywords>
</info>
@ -66,7 +65,7 @@ Accept: */*
== Info: Connection #1 to host %HOSTIP:%HTTPPORT left intact
</file>
<stripfile>
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /(closing|shutting down) connection #\d+/))
$_ = '' if(($_ !~ /left intact/) and ($_ !~ /(closing|shutting down) connection #\d+/))
</stripfile>
</verify>
</testcase>

View file

@ -5,7 +5,6 @@ HTTP
HTTP/2
multi
verbose logs
notxml
</keywords>
</info>
@ -104,7 +103,7 @@ Via: 2 nghttpx
* Connection #0 to host localhost:%HTTP2TLSPORT left intact
</file>
<stripfile>
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /Closing connection/))
$_ = '' if(($_ !~ /left intact/) and ($_ !~ /Closing connection/))
</stripfile>
</verify>
</testcase>

View file

@ -5,7 +5,6 @@ HTTP
HTTP/2
multi
verbose logs
notxml
</keywords>
</info>
@ -104,7 +103,7 @@ Via: 2 nghttpx
* Connection #0 to host localhost:%HTTP2TLSPORT left intact
</file>
<stripfile>
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /Closing connection/))
$_ = '' if(($_ !~ /left intact/) and ($_ !~ /Closing connection/))
</stripfile>
</verify>
</testcase>

View file

@ -5,7 +5,6 @@ HTTP
HTTP/3
multi
verbose logs
notxml
</keywords>
</info>
@ -99,7 +98,7 @@ Via: 3 nghttpx
== Info: Connection #0 to host localhost:%HTTP3PORT left intact
</file>
<stripfile>
$_ = '' if(($_ !~ /left intact/) && ($_ !~ /Closing connection/))
$_ = '' if(($_ !~ /left intact/) and ($_ !~ /Closing connection/))
</stripfile>
<limits>
Maximum allocated: 1800000

View file

@ -2,7 +2,6 @@
<info>
<keywords>
TrackMemory
notxml
</keywords>
</info>
@ -37,7 +36,7 @@ MEM tool_cfgable.c
MEM tool_cfgable.c
</file>
<stripfile>
$_ = '' if((($_ !~ /tool_paramhlp/) && ($_ !~ /tool_cfgable/)) || ($_ =~ /free\(\(nil\)\)/))
$_ = '' if((($_ !~ /tool_paramhlp/) and ($_ !~ /tool_cfgable/)) || ($_ =~ /free\(\(nil\)\)/))
s/:\d+.*//
s:^(MEM )(.*/)(.*):$1$3:
</stripfile>