← Commit list

937b25fbd6

Daniel Stenberg

2026-09-22

SUCCESS Duration: 389s

Subject

tests: remove tool name from libtests using default

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

tests/data/test1156+0 -3

@@ -53,9 +53,6 @@ body
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP resume/range fail range-error content-range combinations
	</name>

tests/data/test1301+0 -3

@@ -9,9 +9,6 @@ libtest

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	curl_strequal tests
	</name>

tests/data/test1308+0 -3

@@ -18,9 +18,6 @@ form-api
	<name>
	formpost tests
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	%LOGDIR/test-%TESTNUMBER
	</command>

tests/data/test1396+0 -3

@@ -10,9 +10,6 @@ libtest

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	curl_easy_escape and curl_easy_unescape
	</name>

tests/data/test1398+0 -3

@@ -9,9 +9,6 @@ libtest

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	curl_msnprintf tests
	</name>

tests/data/test1451+0 -3

@@ -12,9 +12,6 @@ libtest
	<features>
	win32
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	mprintf %I length modifier unit tests
	</name>

tests/data/test1485+0 -3

@@ -30,9 +30,6 @@ Content-Length: 7
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	get curlinfo on last header in callback
	</name>

tests/data/test1500+0 -3

@@ -32,9 +32,6 @@ http
	http
	</features>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	curl_multi_wait

tests/data/test1501+0 -3

@@ -26,9 +26,6 @@ DELAY TYPE 2
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<killserver>
	ftp
	</killserver>

tests/data/test1502+0 -3

@@ -32,9 +32,6 @@ Funny-head: yesyes
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP multi with CURLOPT_RESOLVE, cleanup sequence UA
	</name>

tests/data/test1506+0 -3

@@ -53,9 +53,6 @@ http
	<features>
	verbose-strings
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP GET connection cache limit (CURLMOPT_MAXCONNECTS)
	</name>

tests/data/test1507+0 -3

@@ -17,9 +17,6 @@ libtest
	<server>
	smtp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	# based on bug report #1184
	<name>

tests/data/test1508+0 -3

@@ -10,9 +10,6 @@ libtest

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Close a multi handle without using it
	</name>

tests/data/test1509+0 -3

@@ -52,9 +52,6 @@ http
	http-proxy
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	proxy
	</features>

tests/data/test1510+0 -3

@@ -50,9 +50,6 @@ file contents should appear once for each file
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP GET connection cache limit (CURLOPT_MAXCONNECTS)
	</name>

tests/data/test1511+0 -3

@@ -52,9 +52,6 @@ http
	<features>
	http
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP GET time conditions in repeated requests
	</name>

tests/data/test1512+0 -3

@@ -49,9 +49,6 @@ file contents should appear once for each file
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	GLOBAL CACHE test over two easy performs
	</name>

tests/data/test1513+0 -3

@@ -24,9 +24,6 @@ wait 10
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	return failure immediately from progress callback
	</name>

tests/data/test1514+0 -3

@@ -26,9 +26,6 @@ Connection: close
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP POST with read callback and unknown data size
	</name>

tests/data/test1515+0 -3

@@ -43,9 +43,6 @@ hello
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	caching of manual libcurl DNS entries after DNS cache timeout
	</name>

tests/data/test1517+0 -3

@@ -45,9 +45,6 @@ This is a virtual description of server virtual error.
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP POST, server responds before completed send
	</name>

tests/data/test1518+0 -3

@@ -28,9 +28,6 @@ Connection: close
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	Extract Location: with broken URL

tests/data/test1520+0 -3

@@ -13,9 +13,6 @@ libtest
	<server>
	smtp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	SMTP with CRLF-dot-CRLF in upload payload

tests/data/test1521+0 -3

@@ -9,9 +9,6 @@ libtest

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	Test all curl_easy_setopt and curl_easy_getinfo options

tests/data/test1522+0 -3

@@ -29,9 +29,6 @@ Funny-head: yesyes
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	CURLINFO_SIZE_UPLOAD with small SO_SNDBUF

tests/data/test1523+0 -3

@@ -28,9 +28,6 @@ writedelay: 1000
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	CURLINFO_LOW_SPEED_LIMIT

tests/data/test1525+0 -3

@@ -44,9 +44,6 @@ ETag: "21025-dc7-39462498"
	http
	http-proxy
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	CURLOPT_PROXYHEADER is ignored CURLHEADER_UNIFIED
	</name>

tests/data/test1526+0 -3

@@ -46,9 +46,6 @@ ETag: "21025-dc7-39462498"
	http
	http-proxy
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	CURLOPT_PROXYHEADER: separate host/proxy headers
	</name>

tests/data/test1527+0 -3

@@ -45,9 +45,6 @@ ETag: "21025-dc7-39462498"
	http
	http-proxy
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Same headers with CURLOPT_HEADEROPT == CURLHEADER_UNIFIED
	</name>

tests/data/test1528+0 -3

@@ -36,9 +36,6 @@ stop
	http
	http-proxy
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Separately specified proxy/server headers sent in a proxy GET
	</name>

tests/data/test1529+0 -3

@@ -24,9 +24,6 @@ We-are: good
	http
	http-proxy
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP request-injection in URL sent over proxy
	</name>

tests/data/test1530+0 -3

@@ -11,9 +11,6 @@ libtest
	<features>
	http
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	CURLOPT_OPENSOCKETFUNCTION returns bad socket
	</name>

tests/data/test1531+0 -3

@@ -14,9 +14,6 @@ http
	<features>
	http
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	CURLOPT_POSTFIELDS with binary data set after multi_add_handle
	</name>

tests/data/test1532+0 -3

@@ -23,9 +23,6 @@ Content-Length: 0
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Test CURLINFO_RESPONSE_CODE
	</name>

tests/data/test1533+0 -3

@@ -28,9 +28,6 @@ Early Response
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP with CURLOPT_KEEP_SENDING_ON_ERROR and an early error response
	</name>

tests/data/test1534+0 -3

@@ -25,9 +25,6 @@ Content-Length: 0
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	CURLINFO_FILETIME init and reset
	</name>

tests/data/test1535+0 -3

@@ -24,9 +24,6 @@ Content-Length: 0
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Test CURLINFO_RESPONSE_CODE CURLINFO_PROTOCOL
	</name>

tests/data/test1536+0 -3

@@ -24,9 +24,6 @@ Content-Length: 0
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Test CURLINFO_RESPONSE_CODE CURLINFO_SCHEME
	</name>

tests/data/test1537+0 -3

@@ -13,9 +13,6 @@ libtest

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	libcurl URL escape/unescape tests

tests/data/test1538+0 -3

@@ -17,9 +17,6 @@ libtest
	<features>
	verbose-strings
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	libcurl strerror API call tests

tests/data/test1540+0 -3

@@ -46,9 +46,6 @@ writedelay: 10
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	chunked with trailers and pausing the receive
	</name>

tests/data/test1541+0 -3

@@ -53,9 +53,6 @@ writedelay: 10
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	CURLINFO timer check
	</name>

tests/data/test1542+0 -3

@@ -29,9 +29,6 @@ http
	<features>
	verbose-strings
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	connection reuse with CURLOPT_MAXLIFETIME_CONN
	</name>

tests/data/test1545+0 -3

@@ -20,9 +20,6 @@ form-api
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	use curl_formadd() data twice with unreadable file

tests/data/test1549+0 -3

@@ -33,9 +33,6 @@ cookies
	<name>
	Receive expired cookies and CURLINFO_COOKIELIST
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test1550+0 -3

@@ -14,9 +14,6 @@ libtest
	# Client-side
	<client>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	verify setting pipelining blocklisting options

tests/data/test1551+0 -3

@@ -36,9 +36,6 @@ redirected
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	re-run redirected transfer without setting URL again

tests/data/test1552+0 -3

@@ -35,9 +35,6 @@ imap
	IMAP multi transfer error without curl_multi_remove_handle
	</name>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1'
	</command>

tests/data/test1553+0 -3

@@ -38,9 +38,6 @@ imap
	IMAP cleanup with non-existing hostname
	</name>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	# this MUST use a hostname that does not resolve
	<command>

tests/data/test1554+0 -3

@@ -71,9 +71,6 @@ http
	<name>
	HTTP with shared connection cache
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test1555+0 -3

@@ -24,9 +24,6 @@ wait 10
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	verify api is protected against calls from callbacks
	</name>

tests/data/test1556+0 -3

@@ -32,9 +32,6 @@ Long: %repeat[100001 x A]%
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	send long HTTP headers to header callback
	</name>

tests/data/test1557+0 -3

@@ -12,9 +12,6 @@ libtest
	</reply>

	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	Remove easy handle in pending connections, no dangling entry

tests/data/test1558+0 -3

@@ -15,9 +15,6 @@ libtest
	<features>
	file
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	CURLINFO_PROTOCOL for file:// transfer

tests/data/test1559+0 -3

@@ -18,9 +18,6 @@ libtest
	http
	verbose-strings
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	Set excessive URL lengths

tests/data/test1560+0 -3

@@ -26,9 +26,6 @@ ftp
	<name>
	URL API
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	</client>

	<verify>

tests/data/test1564+0 -3

@@ -17,9 +17,6 @@ libtest
	<features>
	wakeup
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	wakeup before poll with no easy handles
	</name>

tests/data/test1565+0 -3

@@ -29,9 +29,6 @@ wakeup
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	wakeup from another thread
	</name>

tests/data/test1567+0 -3

@@ -37,9 +37,6 @@ redirected
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	re-run redirected transfer without setting CURLU URL again

tests/data/test1568+0 -3

@@ -63,9 +63,6 @@ digest
	<name>
	HTTP with Digest authorization on custom CURLOPT_PORT
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP/%TESTNUMBER %HTTPPORT
	</command>

tests/data/test1569+0 -3

@@ -31,9 +31,6 @@ ftp
	<name>
	FTP first type=A then regular URL
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	"ftp://%HOSTIP:%FTPPORT/%TESTNUMBER;type=A" ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	</command>

tests/data/test1571+0 -3

@@ -62,9 +62,6 @@ http
	<features>
	http
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	CURLFOLLOW_OBEYCODE with custom POST method, 302 => GET

tests/data/test1576+0 -3

@@ -62,9 +62,6 @@ http
	<features>
	http
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	CURLFOLLOW_OBEYCODE with custom PUT method, 302 => custom

tests/data/test1582+0 -3

@@ -35,9 +35,6 @@ https
	<name>
	Negotiate over HTTPS with channel binding
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	https://%HOSTIP:%HTTPSPORT/
	</command>

tests/data/test1587+0 -3

@@ -34,9 +34,6 @@ https
	<name>
	CURLINFO_TLS_SESSION and CURLINFO_TLS_SSL_PTR with OpenSSL
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	https://%HOSTIP:%HTTPSPORT/
	</command>

tests/data/test1588+0 -3

@@ -60,9 +60,6 @@ Nice proxy auth sir!
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	!SSPI
	crypto

tests/data/test1589+0 -3

@@ -59,9 +59,6 @@ http
	http-proxy
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	!SSPI
	crypto

tests/data/test1591+0 -3

@@ -29,9 +29,6 @@ http
	<name>
	HTTP PUT with trailers at the end
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER
	</command>

tests/data/test1592+0 -3

@@ -14,9 +14,6 @@ libtest

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP request, remove handle while resolving, do not block
	</name>

tests/data/test1593+0 -3

@@ -28,9 +28,6 @@ http
	<name>
	HTTP custom header overrides CURLOPT_TIMECONDITION
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test1594+0 -3

@@ -29,9 +29,6 @@ http
	<name>
	HTTP Retry-After header parsing and extraction
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test1597+0 -3

@@ -15,9 +15,6 @@ libtest
	<name>
	CURLOPT_PROTOCOLS_STR
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	</client>

	<verify>

tests/data/test1598+0 -3

@@ -29,9 +29,6 @@ http
	<name>
	HTTP POST with trailers at the end
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/bzz/%TESTNUMBER
	</command>

tests/data/test1599+0 -3

@@ -27,9 +27,6 @@ FTP with netrc using no user but control code in password
	<command>
	ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/netrc%TESTNUMBER
	</command>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<file name="%LOGDIR/netrc%TESTNUMBER" nonewline="yes">
	default passwor?dlogin anonymou\ ' password login anonymous passwor?d.'macdef
	</file>

tests/data/test1605+0 -3

@@ -9,9 +9,6 @@ libtest

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Test negative data lengths as input to libcurl functions
	</name>

tests/data/test1616+0 -3

@@ -57,9 +57,6 @@ proxied one
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	!SSPI
	crypto

tests/data/test1647+0 -3

@@ -50,9 +50,6 @@ https-proxy
	https
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	!SSPI
	crypto

tests/data/test1648+0 -3

@@ -30,9 +30,6 @@ And you should ignore this data.
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	proxy
	</features>

tests/data/test1649+0 -3

@@ -27,9 +27,6 @@ hello
	http
	</server>

-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Set referer first then NULL it
	</name>

tests/data/test1662+0 -3

@@ -46,9 +46,6 @@ http
	<name>
	HTTP formpost from callback and a redirect and switch to GET
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test1678+0 -3

@@ -12,9 +12,6 @@ libtest
	<features>
	SSLS-EXPORT
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	SSL session import tests
	</name>

tests/data/test1686+0 -3

@@ -43,9 +43,6 @@ http
	<name>
	HTTP Digest to different origins and switching credentials
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	%HOSTIP %HTTPPORT
	</command>

tests/data/test1742+0 -3

@@ -40,9 +40,6 @@ proxy
	http
	socks5
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	SOCKS5 CURLAUTH_ONLY does not offer the no authentication method
	</name>

tests/data/test1744+0 -3

@@ -35,9 +35,6 @@ proxy
	http
	socks5
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	SOCKS5 CURLAUTH_ONLY does not reuse an unauthenticated connection
	</name>

tests/data/test1745+1 -3

@@ -6,6 +6,7 @@ FTP
	PASV
	RETR
	SOCKS5
+	libtest
	</keywords>
	</info>

@@ -31,9 +32,6 @@ proxy
	ftp
	socks5
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	SOCKS5 CURLAUTH_ONLY ignores auth done for the FTP data socket
	</name>

tests/data/test1791+0 -3

@@ -18,9 +18,6 @@ libtest
	<name>
	blank COPYPOSTFIELDS and duphandle
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	localhost

tests/data/test1900+0 -3

@@ -22,9 +22,6 @@ http
	<name>
	HSTS curl_easy_duphandle
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://%HOSTIP:%NOLISTENPORT/not-there/%TESTNUMBER

tests/data/test1901+0 -3

@@ -29,9 +29,6 @@ http
	<name>
	Chunked HTTP POST from callback with CURLOPT_POSTFIELDSIZE set
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://%HOSTIP:%HTTPPORT/boom

tests/data/test1902+0 -3

@@ -16,9 +16,6 @@ set COOKIEFILE and COOKIEJAR but make no transfer
	<features>
	cookies
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	%LOGDIR/cookie%TESTNUMBER

tests/data/test1903+0 -3

@@ -31,9 +31,6 @@ http
	<name>
	CURLOPT_COOKIEFILE then reset then set again
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER %LOGDIR/cookies%TESTNUMBER %LOGDIR/cookiesout%TESTNUMBER
	</command>

tests/data/test1905+0 -3

@@ -31,9 +31,6 @@ http
	<name>
	CURLOPT_COOKIELIST set to "FLUSH" of a shared cookie object
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER %LOGDIR/cookies%TESTNUMBER
	</command>

tests/data/test1906+0 -3

@@ -28,9 +28,6 @@ http
	<name>
	CURLOPT_CURLU and CURLOPT_PORT
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	# The tool does two requests, the first sets CURLOPT_PORT to 1
	# the second resets the port again and expects that request to work.

tests/data/test1907+0 -3

@@ -28,9 +28,6 @@ http
	<name>
	CURLINFO_EFFECTIVE_URL with non-scheme URL
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	%HOSTIP:%HTTPPORT/hello/../%TESTNUMBER

tests/data/test1908+0 -3

@@ -48,9 +48,6 @@ alt-svc cache save after resetting the handle
	# make Debug-curl accept Alt-Svc over plain HTTP
	CURL_ALTSVC_HTTP="yeah"
	</setenv>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/altsvc-%TESTNUMBER

tests/data/test1910+0 -3

@@ -40,9 +40,6 @@ http
	<name>
	HTTP credentials with newline and redirect
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	%HOSTIP:%HTTPPORT/%TESTNUMBER

tests/data/test1911+0 -3

@@ -16,9 +16,6 @@ libtest
	<name>
	verify that curl_easy_setopt() rejects too long string inputs
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	</client>

tests/data/test1912+0 -3

@@ -17,9 +17,6 @@ libtest
	<name>
	Cross validate that gcc-typecheck macros match the option types.
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	</client>

tests/data/test1913+0 -3

@@ -25,9 +25,6 @@ ftp
	<name>
	FTP with NOBODY set, getting a missing file
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	ftp://%HOSTIP:%FTPPORT/not-there/%TESTNUMBER

tests/data/test1915+0 -3

@@ -23,9 +23,6 @@ http
	<name>
	HSTS read/write callbacks
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://%HOSTIP:%NOLISTENPORT/not-there/%TESTNUMBER

tests/data/test1916+0 -3

@@ -26,9 +26,6 @@ mqtt
	<name>
	MQTT PUBLISH with no POSTFIELDSIZE set
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command option="binary-trace">
	"mqtt://%HOSTIP:%MQTTPORT/%20"
	</command>

tests/data/test1918+0 -3

@@ -18,9 +18,6 @@ libtest
	<name>
	curl_easy_option_by_name() and curl_easy_option_by_id()
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	</client>

tests/data/test1919+0 -3

@@ -27,9 +27,6 @@ http
	<name>
	set CURLOPT_XOAUTH2_BEARER and do connection reuse
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test1920+0 -3

@@ -36,9 +36,6 @@ http
	<features>
	cookies
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://%HOSTIP:%HTTPPORT/ %LOGDIR/cookie%TESTNUMBER

tests/data/test1921+0 -3

@@ -13,9 +13,6 @@ libtest
	<name>
	Set a URL without scheme, then redirect with default scheme
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	-

tests/data/test1922+0 -3

@@ -52,9 +52,6 @@ CURL_HSTS_HTTP=yes
	<name>
	curl_easy_duphandle copies HSTS cache, auto upgrading HTTP to HTTPS.
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	- %HOSTIP %HTTPPORT %PROXYPORT
	</command>

tests/data/test1933+0 -3

@@ -46,9 +46,6 @@ aws
	<name>
	HTTP AWS_SIGV4 with one provider and auth cred via URL
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://xxx:[email protected]:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT

tests/data/test1934+0 -3

@@ -46,9 +46,6 @@ aws
	<name>
	HTTP AWS_SIGV4 with two providers
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT

tests/data/test1935+0 -3

@@ -46,9 +46,6 @@ aws
	<name>
	HTTP AWS_SIGV4 with two providers and region
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT

tests/data/test1936+0 -3

@@ -46,9 +46,6 @@ aws
	<name>
	HTTP AWS_SIGV4 with two providers, region and service
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT

tests/data/test1937+0 -3

@@ -47,9 +47,6 @@ aws
	<name>
	HTTP POST with AWS_SIGV4
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT

tests/data/test1938+0 -3

@@ -47,9 +47,6 @@ aws
	<name>
	HTTP POST with AWS_SIGV4 for binary data
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://127.0.0.1:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT

tests/data/test1939+0 -3

@@ -42,9 +42,6 @@ http-proxy
	<name>
	curl_easy_cleanup without curl_multi_remove_handle - in CONNECT
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	https://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%PROXYPORT

tests/data/test1940+0 -3

@@ -43,9 +43,6 @@ http
	<name>
	curl_easy_header
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER

tests/data/test1945+0 -3

@@ -46,9 +46,6 @@ http-proxy
	<name>
	curl_easy_nextheader with server + CONNECT
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://hello:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT

tests/data/test1947+0 -3

@@ -54,9 +54,6 @@ http
	<name>
	curl_easy_nextheader on second request after first did redirects
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0003

tests/data/test1948+0 -3

@@ -44,9 +44,6 @@ http
	<name>
	CURLOPT_POST after CURLOPT_UPLOAD reusing handle
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER

tests/data/test1955+0 -3

@@ -46,9 +46,6 @@ aws
	<name>
	HTTP AWS_SIGV4 without X-Xxx-Content-Sha256
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPPORT

tests/data/test1956+0 -3

@@ -46,9 +46,6 @@ aws
	<name>
	HTTP AWS_SIGV4 with X-Xxx-Content-Sha256 of empty payload
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPPORT

tests/data/test1957+0 -3

@@ -46,9 +46,6 @@ aws
	<name>
	HTTP AWS_SIGV4 with X-Xxx-Content-Sha256 of arbitrary payload
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPPORT

tests/data/test1958+0 -3

@@ -45,9 +45,6 @@ aws
	<name>
	HTTP AWS_SIGV4 with X-Xxx-Content-Sha256 with whitespace
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPPORT

tests/data/test1959+0 -3

@@ -46,9 +46,6 @@ aws
	<name>
	HTTP AWS_SIGV4 with long value for X-Xxx-Content-Sha256
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPPORT

tests/data/test1960+0 -3

@@ -33,9 +33,6 @@ http
	<name>
	application hands over already connected socket
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://%HOSTIP:%HTTPPORT/file %HOSTIP %HTTPPORT

tests/data/test1964+0 -3

@@ -44,9 +44,6 @@ aws
	<name>
	HTTP AWS_SIGV4 with X-Xxx-Date header set manually
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://xxx:[email protected]:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT

tests/data/test1965+0 -3

@@ -12,9 +12,6 @@ libtest
	<name>
	curl_url_set() different schemes
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	</client>

	# Verify data after the test has been "shot"

tests/data/test1967+0 -3

@@ -13,9 +13,6 @@ libtest
	<name>
	curl_url_set() a URL without guessing a scheme
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://%HOSTIP:%NOLISTENPORT/not-there/%TESTNUMBER

tests/data/test1970+0 -3

@@ -46,9 +46,6 @@ aws
	<name>
	HTTP AWS_SIGV4 for AWS S3: UPLOAD with INFILESIZE=0
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPPORT

tests/data/test1971+0 -3

@@ -39,9 +39,6 @@ aws
	<name>
	HTTP AWS_SIGV4 for AWS S3: UPLOAD with unknown INFILESIZE
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPPORT

tests/data/test1972+0 -3

@@ -49,9 +49,6 @@ CURL_ENTROPY=12345678
	<name>
	HTTP AWS_SIGV4 for AWS S3: MIMEPOST
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPPORT

tests/data/test1973+0 -3

@@ -46,9 +46,6 @@ aws
	<name>
	HTTP AWS_SIGV4 for AWS S3: POSTFIELDS
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPPORT

tests/data/test1974+0 -3

@@ -46,9 +46,6 @@ aws
	<name>
	HTTP AWS_SIGV4 for AWS S3: GET
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPPORT

tests/data/test1975+0 -3

@@ -39,9 +39,6 @@ aws
	<name>
	HTTP AWS_SIGV4 for AWS S3: UPLOAD with given x-amz-content-sha256
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://exam.ple.com:9000/aws_sigv4/testapi/test exam.ple.com:9000:%HOSTIP:%HTTPPORT

tests/data/test1977+0 -3

@@ -28,9 +28,6 @@ http
	<name>
	CURLOPT_CURLU and CURLINFO_EFFECTIVE_URL
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	# The test does three transfers to check how CURLINFO_EFFECTIVE_URL is reported
	# when CURLOPT_CURLU changes between transfers. (Bug #15984)

tests/data/test1978+0 -3

@@ -34,9 +34,6 @@ aws
	<name>
	HTTP AWS_SIGV4 canonical request duplicate header test
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://xxx:[email protected]:9000/%TESTNUMBER/testapi/test 127.0.0.1:9000:%HOSTIP:%HTTPPORT
	</command>

tests/data/test1985+0 -3

@@ -42,9 +42,6 @@ Digest response when not asked, then use Digest
	crypto
	digest
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://firsthost:%HTTPPORT/%TESTNUMBER http://secondhost:%HTTPPORT/%TESTNUMBER0001 %HTTPPORT %HOSTIP

tests/data/test2023+0 -3

@@ -107,9 +107,6 @@ Finally, this is the real page!
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP authorization retry (Basic)

tests/data/test2032+0 -3

@@ -76,9 +76,6 @@ SSL
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	NTLM connection mapping

tests/data/test2082+0 -3

@@ -28,9 +28,6 @@ http
	<name>
	Pre-request callback for HTTP
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	%HOSTIP:%HTTPPORT/%TESTNUMBER

tests/data/test2118+0 -3

@@ -24,9 +24,6 @@ local-http
	<server>
	https test-localhost.nn.pem
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	VERIFYHOST with VERIFYPEER disabled rejects a mismatching certificate
	</name>

tests/data/test2270+0 -3

@@ -27,9 +27,6 @@ form-api
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	reject HTTP form and MIME upload resume
	</name>

tests/data/test2301+0 -3

@@ -41,9 +41,6 @@ http
	<name>
	WebSockets via callback (raw mode) + curl_ws_send()
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test2302+0 -3

@@ -41,9 +41,6 @@ http
	<name>
	WebSockets via callback (frame mode) + curl_ws_send()
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test2304+0 -3

@@ -40,9 +40,6 @@ http
	<name>
	WebSockets curl_ws_recv() with closed connection
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test2306+0 -3

@@ -40,9 +40,6 @@ Date: Wed, 10 May 2023 14:58:08 GMT
	http
	</server>
	# tool to run
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP GET reused handle with first header folded

tests/data/test2308+0 -3

@@ -30,9 +30,6 @@ Funny-head: yesyes
	http
	</server>
	# tool to run
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	verify return code when write callback returns error

tests/data/test2309+0 -3

@@ -38,9 +38,6 @@ proxy
	<name>
	HTTP with .netrc using duped easy handle
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://github.com %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/
	</command>

tests/data/test2397+0 -4

@@ -28,10 +28,6 @@ hej
	http
	</server>

-	<tool>
-	lib%TESTNUMBER
-	</tool>
-
	<name>
	Get CURLINFO_REFERER set CURLOPT_REFERER
	</name>

tests/data/test2402+0 -3

@@ -56,9 +56,6 @@ verbose-strings
	<server>
	http/2
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP GET multiple files over HTTP/2 using HTTPS
	</name>

tests/data/test2404+0 -3

@@ -56,9 +56,6 @@ verbose-strings
	<server>
	http/2
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP/2 using STREAM_WEIGHTs
	</name>

tests/data/test2405+0 -3

@@ -35,9 +35,6 @@ wakeup
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	checking curl_multi_waitfds functionality
	</name>

tests/data/test2412+0 -3

@@ -34,9 +34,6 @@ wakeup
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	checking curl_multi_fdset on nothing to do
	</name>

tests/data/test2414+0 -3

@@ -15,9 +15,6 @@ wakeup
	</features>
	<server>
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	wakeup, perform and poll needs to exit
	</name>

tests/data/test2453+0 -3

@@ -33,9 +33,6 @@ http
	<name>
	CURLMINFO_XFERS_DONE tracks unread completion messages
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test2502+0 -3

@@ -55,9 +55,6 @@ verbose-strings
	<server>
	http/3
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP GET multiple over HTTP/3
	</name>

tests/data/test2504+0 -3

@@ -26,9 +26,6 @@ file contents should appear once for each file
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	custom Host with cookie, handle reuse, no custom Host:
	</name>

tests/data/test2505+0 -3

@@ -36,9 +36,6 @@ file contents should appear once for each file
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	verify CURLOPT_AUTOREFERER switched off
	</name>

tests/data/test2506+0 -3

@@ -33,9 +33,6 @@ http
	<features>
	proxy
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	netrc with redirect using proxy
	</name>

tests/data/test2700+0 -3

@@ -18,9 +18,6 @@ ws
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	ws://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test2805+0 -3

@@ -17,9 +17,6 @@ libtest
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP wildcards with percent sign in file name
	</name>

tests/data/test2924+0 -3

@@ -28,9 +28,6 @@ chunked data fun%CR

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<server>
	http

tests/data/test3010+0 -3

@@ -40,9 +40,6 @@ http
	<name>
	HTTP retry-after reset
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	%HOSTIP:%HTTPPORT/%TESTNUMBER

tests/data/test3025+0 -3

@@ -26,9 +26,6 @@ http
	<name>
	CURLOPT_HTTP200ALIASES
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test3026+0 -3

@@ -24,9 +24,6 @@ threaded-resolver
	<name>
	curl_global_init thread-safety
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	</client>

	# Verify data after the test has been "shot"

tests/data/test3027+0 -3

@@ -29,9 +29,6 @@ ftp
	<name>
	Get a file via FTP but 550 after MDTM command
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command option="no-include">
	ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
	</command>

tests/data/test3033+0 -3

@@ -34,9 +34,6 @@ http
	<name>
	CURLOPT_FRESH_CONNECT=2
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test3034+0 -3

@@ -23,9 +23,6 @@ Location: /%TESTNUMBER
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Test reset resolves rewind failure
	</name>

tests/data/test3100+0 -3

@@ -55,9 +55,6 @@ u=http://www.curl.example.com/fakesdp.ps
	<server>
	rtsp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	RTSP Authentication check

tests/data/test3101+0 -3

@@ -60,9 +60,6 @@ https
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP auth without redirection protocols

tests/data/test3102+0 -3

@@ -24,9 +24,6 @@ SSL
	<server>
	https
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	verify certificate chain order with simple HTTPS GET
	</name>

tests/data/test3103+0 -3

@@ -34,9 +34,6 @@ proxy
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	CURLOPT_COOKIELIST without expiry
	</name>

tests/data/test3104+0 -3

@@ -34,9 +34,6 @@ proxy
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	CURLOPT_COOKIELIST with Netscape format
	</name>

tests/data/test3105+0 -3

@@ -9,9 +9,6 @@ libtest

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	curl_multi_remove_handle twice
	</name>

tests/data/test3107+0 -3

@@ -25,9 +25,6 @@ hello
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	reject internal easy handle passed to a notify callback
	</name>

tests/data/test3207+0 -3

@@ -35,9 +35,6 @@ https
	<name>
	concurrent HTTPS GET using shared SSL session cache
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	# provide URL and ca-cert
	<command>
	https://localhost:%HTTPSPORT/%TESTNUMBER %CERTDIR/certs/test-ca.crt

tests/data/test3208+0 -3

@@ -31,9 +31,6 @@ Funny-head: yesyes
	https
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	easy_perform, multi_perform, easy_perform the same handle

tests/data/test3231+0 -3

@@ -28,9 +28,6 @@ http
	<name>
	CONNECT_ONLY survives the per-host connection limit
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER
	</command>

tests/data/test3233+0 -3

@@ -34,9 +34,6 @@ Curl-private: swsclose
	<server>
	rtsp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	RTSP session id is not sent to another origin after a redirect

tests/data/test3595+0 -3

@@ -9,9 +9,6 @@ libtest

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	curl_mime_free
	</name>

tests/data/test3596+0 -3

@@ -21,9 +21,6 @@ Mime
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Curl_mime_prepare_headers
	</name>

tests/data/test464+0 -3

@@ -14,9 +14,6 @@ libtest
	Debug
	asyn-rr
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	https://localhost:%NOLISTENPORT/464
	</command>

tests/data/test500+0 -3

@@ -31,9 +31,6 @@ Funny-head: yesyes
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	simple libcurl HTTP GET tool

tests/data/test5000+0 -3

@@ -35,9 +35,6 @@ httpsig
	<name>
	httpsig: basic GET with Ed25519
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	http://example.com:9000/%TESTNUMBER/resource example.com:9000:%HOSTIP:%HTTPPORT

tests/data/test5004+0 -3

@@ -36,9 +36,6 @@ httpsig
	<name>
	httpsig: Ed25519 POST with headers (RFC test vector)
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<setenv>
	CURL_HTTPSIG_CREATED=1618884473

tests/data/test501+0 -3

@@ -16,9 +16,6 @@ libtest
	http
	</features>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	simple libcurl attempt operation without URL set

tests/data/test502+0 -3

@@ -23,9 +23,6 @@ moo
	file
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	simple multi file:// get

tests/data/test503+0 -3

@@ -49,9 +49,6 @@ http
	http-proxy
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	proxy
	</features>

tests/data/test504+0 -3

@@ -22,9 +22,6 @@ http
	proxy
	</features>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	simple multi through local proxy without listener

tests/data/test505+0 -3

@@ -18,9 +18,6 @@ libtest
	ftp
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	FTP upload with rename after transfer

tests/data/test506+0 -3

@@ -72,9 +72,6 @@ HTTP with shared cookie list (and dns cache)
	<setenv>
	TZ=GMT
	</setenv>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/jar%TESTNUMBER
	</command>

tests/data/test507+0 -3

@@ -21,9 +21,6 @@ http
	<name>
	multi interface get with non-existing hostname
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<command>
	http://non-existing-host.haxx.se/
	</command>

tests/data/test508+0 -3

@@ -27,9 +27,6 @@ hello
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	send HTTP POST using read callback

tests/data/test509+0 -3

@@ -16,9 +16,6 @@ libtest
	http
	</features>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	initialization with memory callbacks and actual usage

tests/data/test510+0 -3

@@ -28,9 +28,6 @@ hello
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	send HTTP POST using read callback, using chunked transfer-encoding

tests/data/test511+0 -3

@@ -21,9 +21,6 @@ REPLY SIZE 550 bluah you f00l!
	ftp
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	FTP with FILETIME and NOBODY but missing file

tests/data/test512+0 -3

@@ -26,9 +26,6 @@ hello
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	simple curl_easy_duplicate() test

tests/data/test513+0 -3

@@ -18,9 +18,6 @@ libtest
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	send HTTP POST using read callback that returns CURL_READFUNC_ABORT

tests/data/test514+0 -3

@@ -29,9 +29,6 @@ Funny-head: yesyes
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	First set options to POST and then to make HEAD
	</name>

tests/data/test515+0 -3

@@ -25,9 +25,6 @@ OK
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	make a POSTFIELDS set to NULL with POSTFIELDSIZE set to zero

tests/data/test516+0 -3

@@ -30,9 +30,6 @@ form-api
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	make an HTTPPOST set to NULL

tests/data/test517+0 -3

@@ -13,9 +13,6 @@ libtest
	# Client-side
	<client>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	curl_getdate() testing

tests/data/test518+0 -3

@@ -35,9 +35,6 @@ http
	getrlimit
	</features>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	# precheck is a command line to run before the test, to see if we can execute
	# the test or not
	<precheck>

tests/data/test519+0 -3

@@ -48,9 +48,6 @@ content2
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	GET same URL twice with different users

tests/data/test520+0 -3

@@ -23,9 +23,6 @@ REPLY MDTM 213 20030405060708
	ftp
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	FTP RETR with FILETIME

tests/data/test521+0 -3

@@ -30,9 +30,6 @@ dr-xr-xr-x 5 0 1 512 Oct 1 1997 usr
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP dir list PASV with CURLOPT_PORT
	</name>

tests/data/test523+0 -3

@@ -31,9 +31,6 @@ hello
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTP GET with proxy and CURLOPT_PORT
	</name>

tests/data/test524+0 -3

@@ -17,9 +17,6 @@ libtest
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP upload with target URL ending with slash
	</name>

tests/data/test525+0 -3

@@ -21,9 +21,6 @@ libtest
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP PORT upload using multi interface
	</name>

tests/data/test526+0 -3

@@ -28,9 +28,6 @@ file contents should appear once for each file
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP RETR same file using different handles but same connection
	</name>

tests/data/test530+0 -3

@@ -32,9 +32,6 @@ Funny-head: yesyes
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	multi_socket interface transfer with callbacks returning error
	</name>

tests/data/test533+0 -3

@@ -26,9 +26,6 @@ REPLY SIZE 500 Can't check for file existence
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP RETR a non-existing file twice using the multi interface
	</name>

tests/data/test536+0 -3

@@ -32,9 +32,6 @@ hello
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	CURLINFO_USED_PROXY
	</name>

tests/data/test537+0 -3

@@ -35,9 +35,6 @@ http
	getrlimit
	</features>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	# precheck is a command line to run before the test, to see if we can execute
	# the test or not
	<precheck>

tests/data/test539+0 -3

@@ -29,9 +29,6 @@ contents for file number two
	ftp
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	Two FTP fetches using different CURLOPT_FTP_FILEMETHOD

tests/data/test540+0 -3

@@ -63,9 +63,6 @@ Nice proxy auth sir!
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	!SSPI
	crypto

tests/data/test541+0 -3

@@ -18,9 +18,6 @@ libtest
	ftp
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	FTP upload and upload same file again without rewind

tests/data/test542+0 -3

@@ -29,9 +29,6 @@ Accept-ranges: bytes
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP a file with NOBODY yes and HEADER no
	</name>

tests/data/test543+0 -3

@@ -10,9 +10,6 @@ libtest

	# Client-side
	<client>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	curl_easy_escape
	</name>

tests/data/test544+0 -3

@@ -26,9 +26,6 @@ OK
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP POST text data using CURLOPT_COPYPOSTFIELDS

tests/data/test547+0 -3

@@ -74,9 +74,6 @@ Contents of that page you requested, sir.
	http
	</server>
	# tool to use
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	NTLM
	SSL

tests/data/test549+0 -3

@@ -34,9 +34,6 @@ http
	ftp
	proxy
	</features>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP RETR over proxy with CURLOPT_PROXY_TRANSFER_MODE
	</name>

tests/data/test552+0 -3

@@ -52,9 +52,6 @@ Contents of that page you requested, sir.
	http
	</server>
	# tool to use
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	!SSPI
	crypto

tests/data/test553+0 -3

@@ -28,9 +28,6 @@ hello
	http
	</server>
	# tool to use
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	</features>
	<name>

tests/data/test554+0 -3

@@ -47,9 +47,6 @@ form-api
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP multi-part formpost using read callback for the file part

tests/data/test555+0 -3

@@ -79,9 +79,6 @@ Contents of that page you requested, sir.
	http
	</server>
	# tool to use
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	NTLM
	SSL

tests/data/test556+0 -3

@@ -25,9 +25,6 @@ Connection: close
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	send and recv HTTP
	</name>

tests/data/test557+0 -3

@@ -13,9 +13,6 @@ libtest
	# Client-side
	<client>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	curl_mprintf() testing

tests/data/test558+0 -3

@@ -18,9 +18,6 @@ TrackMemory
	IPv6
	</features>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	libtest memory tracking operational

tests/data/test559+0 -3

@@ -32,9 +32,6 @@ Silly-header: %repeat[511 x Z]%
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	use tiny CURLOPT_BUFFERSIZE

tests/data/test560+0 -3

@@ -29,9 +29,6 @@ SSL
	<server>
	https
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	simple HTTPS GET with multi interface
	</name>

tests/data/test562+0 -3

@@ -21,9 +21,6 @@ over FTP
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP a type=A URL and CURLOPT_PORT set
	</name>

tests/data/test564+0 -3

@@ -31,9 +31,6 @@ works
	ftp
	socks4
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP RETR a file over a SOCKS proxy using the multi interface
	</name>

tests/data/test566+0 -3

@@ -30,9 +30,6 @@ Funny-head: yesyes
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP GET with CURLINFO_CONTENT_LENGTH_DOWNLOAD and 0 bytes transfer

tests/data/test567+0 -3

@@ -25,9 +25,6 @@ Curl-Private: swsclose
	<server>
	rtsp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	simple RTSP OPTIONS command

tests/data/test568+0 -3

@@ -50,9 +50,6 @@ Informational: Empty Options Response
	<server>
	rtsp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	RTSP Announce (PUT and POST style) test

tests/data/test569+0 -3

@@ -58,9 +58,6 @@ CSeq: 6
	<server>
	rtsp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	RTSP Session ID parsing

tests/data/test570+0 -3

@@ -42,9 +42,6 @@ CSeq: 1000
	<server>
	rtsp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	RTSP CSeq and Session Mismatch checks

tests/data/test571+0 -3

@@ -78,9 +78,6 @@ rtp: part 4 channel 0 size 63
	<server>
	rtsp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	RTSP RTP Interleaving Test

tests/data/test572+0 -3

@@ -65,9 +65,6 @@ Informational: Empty Options Response
	<server>
	rtsp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	RTSP GET_PARAMETER (Put/Heartbeat/Post)

tests/data/test573+0 -3

@@ -32,9 +32,6 @@ Funny-head: yesyes
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	verify connect time with multi interface

tests/data/test574+0 -3

@@ -19,9 +19,6 @@ libtest
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP wildcard download - changed fnmatch, 2x perform (Unix LIST)
	</name>

tests/data/test575+0 -3

@@ -22,9 +22,6 @@ libtest
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP wildcard download - dup_handle and multi interface
	</name>

tests/data/test576+0 -3

@@ -20,9 +20,6 @@ libtest
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP wildcard - skip/parser_correctness/CURLOPT_FNMATCH_FUNCTION (Unix)
	</name>

tests/data/test578+0 -3

@@ -31,9 +31,6 @@ Funny-head: yesyes
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP POST lower than MAX_INITIAL_POST_SIZE with progress callback

tests/data/test579+0 -3

@@ -62,9 +62,6 @@ crypto
	digest
	</features>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	small chunked HTTP POSTs with digest auth and progress callback

tests/data/test582+0 -3

@@ -19,9 +19,6 @@ libtest
	<server>
	sftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	SFTP upload using multi interface
	</name>

tests/data/test583+0 -3

@@ -19,9 +19,6 @@ libtest
	<server>
	sftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	SFTP with multi interface, remove handle early
	</name>

tests/data/test589+0 -3

@@ -30,9 +30,6 @@ Mime
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	make an HTTP MIME POST set to NULL

tests/data/test590+0 -3

@@ -72,9 +72,6 @@ Contents of that page you requested, sir.
	http
	</server>
	# tool to use
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	NTLM
	SSL

tests/data/test591+0 -3

@@ -30,9 +30,6 @@ REPLY EPRT 500 we don't like EPRT now
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP multi PORT and 425 on upload
	</name>

tests/data/test597+0 -3

@@ -13,9 +13,6 @@ libtest
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP connect only option
	</name>

tests/data/test598+0 -3

@@ -49,9 +49,6 @@ Content-Type: text/html
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	curl_easy_reset with referer and other strings set

tests/data/test599+0 -3

@@ -63,9 +63,6 @@ this data is slightly larger than the first piece
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	# Bug 3510057 pointed out that when following a location to a larger chunked
	# encoded page, the first size would still be used in the progress callback

tests/data/test643+0 -3

@@ -47,9 +47,6 @@ Mime
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP multi-part mimepost using read callback for the file part

tests/data/test650+0 -3

@@ -42,9 +42,6 @@ form-api
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP formpost using form API - with redirect and re-POST

tests/data/test651+0 -3

@@ -31,9 +31,6 @@ form-api
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	curl_formadd with huge COPYCONTENTS

tests/data/test652+0 -3

@@ -20,9 +20,6 @@ Mime
	<server>
	smtp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	SMTP with encoded huge mime data contents

tests/data/test653+0 -3

@@ -47,9 +47,6 @@ Mime
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	Reuse of handle after altering mime data

tests/data/test654+0 -3

@@ -47,9 +47,6 @@ Mime
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP duplicate easy handle with mime data

tests/data/test655+0 -3

@@ -29,9 +29,6 @@ hello
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	resolver start callback

tests/data/test658+0 -3

@@ -28,9 +28,6 @@ Funny-head: yesyes
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Pass URL to libcurl with CURLOPT_CURLU
	</name>

tests/data/test659+0 -3

@@ -29,9 +29,6 @@ Funny-head: yesyes
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	CURLOPT_CURLU without the path set - over proxy
	</name>

tests/data/test661+0 -3

@@ -19,9 +19,6 @@ libtest
	ftp
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	Avoid redundant CWDs

tests/data/test666+0 -3

@@ -38,9 +38,6 @@ Mime
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP mime post with binary-encoded huge data contents

tests/data/test667+0 -3

@@ -40,9 +40,6 @@ Mime
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP chunked mimepost using single-byte read callback with encoder

tests/data/test668+0 -3

@@ -40,9 +40,6 @@ Mime
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	HTTP mimepost early end of data detection

tests/data/test670+0 -3

@@ -40,9 +40,6 @@ Mime
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	Request pause from mime read callback: multi

tests/data/test674+0 -3

@@ -29,9 +29,6 @@ Funny-head: yesyes
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	Set CURLOPT_CURLU and dupe the handle
	</name>

tests/data/test676+0 -3

@@ -52,9 +52,6 @@ Content-Type: text/html
	http
	</server>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	verify setting CURLOPT_COOKIEFILE to NULL again

tests/data/test677+0 -3

@@ -22,9 +22,6 @@ imap
	<name>
	IMAP with CONNECT_ONLY, custom command then exit
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<command>
	imap://%HOSTIP:%IMAPPORT/677

tests/data/test678+0 -3

@@ -32,9 +32,6 @@ https test-localhost.pem
	<name>
	HTTPS GET using CURLOPT_CAINFO_BLOB
	</name>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	# provide URL and ca-cert
	<command>
	https://localhost:%HTTPSPORT/%TESTNUMBER %CERTDIR/certs/test-ca.crt

tests/data/test694+0 -3

@@ -87,9 +87,6 @@ Contents of that second request. Differn.
	http
	</server>
	# tool to use
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<features>
	NTLM
	!SSPI

tests/data/test695+0 -3

@@ -26,9 +26,6 @@ Mime
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	MIME parts reuse as a child part

tests/data/test751+0 -3

@@ -14,9 +14,6 @@ libtest
	# Client-side
	<client>
	# tool is what to use instead of 'curl'
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	multi - add many easy handles

tests/data/test753+0 -3

@@ -16,9 +16,6 @@ ftp
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	cleanup easy without multi_remove_handle
	</name>

tests/data/test757+0 -3

@@ -26,9 +26,6 @@ Mime
	<server>
	http
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>

	<name>
	MIME parts reused as a child part, using data_cb

tests/data/test758+0 -3

@@ -36,9 +36,6 @@ OpenSSL
	<server>
	https
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	HTTPS multi_socket interface transfer with callbacks returning error
	</name>

tests/data/test766+0 -3

@@ -22,9 +22,6 @@ hello
	<server>
	ftp
	</server>
-	<tool>
-	lib%TESTNUMBER
-	</tool>
	<name>
	FTP PORT with sockopt callback refusing the accept
	</name>