Each test case now specifies which server(s) it needs, without relying on the

test number.

tests/data/test1

@@ -20,6 +20,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 simple HTTP GET
  </name>

tests/data/test10

@@ -12,6 +12,9 @@ blablabla
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 simple HTTP PUT from file
  </name>

tests/data/test100

@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP dir list PASV
  </name>

tests/data/test101

@@ -17,6 +17,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP dir list, PORT with specified IP
  </name>

tests/data/test102

@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP RETR PASV
  </name>

tests/data/test103

@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP RETR PORT with CWD
  </name>

tests/data/test104

@@ -7,6 +7,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP --head to get file size only
  </name>

tests/data/test105

@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP user+password in URL and ASCII transfer
  </name>

tests/data/test106

@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP GET with type=A style ASCII URL using %20 codes
  </name>

tests/data/test107

@@ -1,6 +1,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP PASV upload file
  </name>

tests/data/test108

@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP PORT upload with CWD
  </name>

tests/data/test109

@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP PASV upload append
  </name>

tests/data/test11

@@ -36,6 +36,9 @@ If this is received, the location following worked
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 simple HTTP Location: following
  </name>

tests/data/test110

@@ -11,6 +11,9 @@ but we emulate that
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download resume with set limit
  </name>

tests/data/test111

@@ -7,6 +7,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download resume beyond file size
  </name>

tests/data/test112

@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP PASV upload resume
  </name>

tests/data/test113

@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed login: USER not valid
  </name>

tests/data/test114

@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed login: PASS not valid
  </name>

tests/data/test115

@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed PASV
  </name>

tests/data/test116

@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed PORT
  </name>

tests/data/test117

@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed TYPE
  </name>

tests/data/test118

@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed RETR
  </name>

tests/data/test119

@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed RETR with PORT
  </name>

tests/data/test12

@@ -20,6 +20,9 @@ ink="#ffffff" vlink="#cccccc">
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP range support
  </name>

tests/data/test120

@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 ftp download with post-quote delete operation
  </name>

tests/data/test121

@@ -12,6 +12,9 @@ works
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 ftp download with post- and pre-transfer delete operations
  </name>

tests/data/test122

@@ -7,6 +7,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download resume with whole file already downloaded
  </name>

tests/data/test123

@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP upload resume with whole file already downloaded
  </name>

tests/data/test124

@@ -7,6 +7,9 @@ we can still send data even if pwd fails!
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed PWD
  </name>

tests/data/test125

@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download, failed CWD
  </name>

tests/data/test126

@@ -7,6 +7,9 @@ this is file contents
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download with multiple replies at once in RETR
  </name>

tests/data/test127

@@ -7,6 +7,9 @@ moooooooo
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP --disable-epsv
  </name>

tests/data/test128

@@ -4,6 +4,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP upload with --crlf
  </name>

tests/data/test13

@@ -11,6 +11,9 @@ blabla custom request result
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP custom request 'DELETE'
  </name>

tests/data/test130

@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client requires=netrc_debug>
+<server>
+ftp
+</server>
  <name>
 FTP (optional .netrc; no user/pass) dir list PASV
  </name>

tests/data/test131

@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client requires=netrc_debug>
+<server>
+ftp
+</server>
  <name>
 FTP (optional .netrc; user/no pass) dir list PASV
  </name>

tests/data/test132

@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client requires=netrc_debug>
+<server>
+ftp
+</server>
  <name>
 FTP (optional .netrc; user/passwd supplied) dir list PASV
  </name>

tests/data/test133

@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client requires=netrc_debug>
+<server>
+ftp
+</server>
  <name>
 FTP (compulsory .netrc; ignored user/passwd) dir list PASV
  </name>

tests/data/test134

@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client requires=netrc_debug>
+<server>
+ftp
+</server>
  <name>
 FTP (optional .netrc; programmatic user/passwd) dir list PASV
  </name>

tests/data/test135

@@ -16,6 +16,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP retrieve a byte-range
  </name>

tests/data/test136

@@ -7,6 +7,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP with user and no password
  </name>

tests/data/test137

@@ -7,6 +7,9 @@ this is file contents
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download without size in RETR string
  </name>

tests/data/test138

@@ -10,6 +10,9 @@ this is file contents
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download without size in RETR string and no SIZE command
  </name>

tests/data/test139

@@ -10,6 +10,9 @@ this is file contents
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download a newer file with -z
  </name>

tests/data/test14

@@ -10,6 +10,9 @@ Connection: close
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP HEAD with Connection: close
  </name>

tests/data/test140

@@ -9,6 +9,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download file with -z, expected to not transfer
  </name>

tests/data/test141

@@ -9,6 +9,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download info with -I
  </name>

tests/data/test142

@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP URL with too deep (100+) dir hierarchy
  </name>

tests/data/test15

@@ -12,6 +12,9 @@ Repeated nonsense-headers
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 --write-out test
  </name>

tests/data/test16

@@ -13,6 +13,9 @@ the content goes here
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with proxy athorization
  </name>

tests/data/test17

@@ -10,6 +10,9 @@ This is the proof it works
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with config file on stdin
  </name>

tests/data/test18

@@ -22,6 +22,9 @@ hoo
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 multiple requests using {} in URL
  </name>

tests/data/test19

@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+none
+</server>
  <name>
 attempt connect to non-listening socket
  </name>

tests/data/test190

@@ -5,6 +5,9 @@ moooooooo
 
 # Client-side
 <client>
+<server>
+ftp
+</server>
  <name>
 FTP download with strict timeout and slow CWD
  </name>

tests/data/test2

@@ -14,6 +14,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP GET with user and password
  </name>

tests/data/test20

@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 attempt connect to non-existing host name
  </name>

tests/data/test200

@@ -11,6 +11,9 @@ moo
 
 # Client-side
 <client>
+<server>
+none
+</server>
  <name>
 basic file:// file
  </name>

tests/data/test201

@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+none
+</server>
  <name>
 missing file:// file
  </name>

tests/data/test202

@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+none
+</server>
  <name>
 two file:// URLs to stdout
  </name>

tests/data/test21

@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 use curl with multiple request methods
  </name>

tests/data/test22

@@ -10,6 +10,9 @@ This is the proof it works
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 get HTTP with URL > 10000 bytes
  </name>

tests/data/test23

@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 unsupported protocol:// URL
  </name>

tests/data/test24

@@ -10,6 +10,9 @@ This silly page doesn't reaaaaaly exist so you should not get it.
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP GET fail silently on HTTP error return
  </name>

tests/data/test25

@@ -51,6 +51,9 @@ Connection: close
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 looping HTTP Location: following with --max-redirs, no persistance
  </name>

tests/data/test26

@@ -11,6 +11,9 @@ Connection: close
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 specify more -o than URLs
  </name>

tests/data/test27

@@ -11,6 +11,9 @@ Set-Cookie: path=/; thewinneris=nowayyouwin;
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 Get same cookie page several times
  </name>

tests/data/test28

@@ -36,6 +36,9 @@ If this is received, the location following worked
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP Location: following with extra spaces in header
  </name>

tests/data/test29

@@ -14,6 +14,9 @@ wait 10
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with 2 secs timeout
  </name>

tests/data/test3

@@ -14,6 +14,9 @@ this is data even though Content-Length is set to zero
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP POST with user and password
  </name>

tests/data/test30

@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with no data in server reply
  </name>

tests/data/test300

@@ -14,6 +14,9 @@ MooMoo
 #
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 simple HTTPS GET
  </name>

tests/data/test301

@@ -14,6 +14,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 HTTPS GET with user and password
  </name>

tests/data/test302

@@ -7,6 +7,9 @@ MOOOOO
 #
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 HTTPS GET over HTTP proxy fails
  </name>

tests/data/test303

@@ -14,6 +14,9 @@ wait 10
 
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 HTTPS with 2 secs timeout
  </name>

tests/data/test304

@@ -12,6 +12,9 @@ blablabla
 
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 HTTPS multipart formpost
  </name>

tests/data/test305

@@ -6,6 +6,9 @@
 
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 insecure HTTPS without permission
  </name>

tests/data/test306

@@ -27,6 +27,9 @@ verify
 #
 # Client-side
 <client>
+<server>
+https
+</server>
  <name>
 HTTPS GET, receive no headers only data!
  </name>

tests/data/test31

@@ -23,6 +23,9 @@ boo
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with weirdly formatted cookies and cookiejar storage
  </name>

tests/data/test32

@@ -20,6 +20,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with -d and -G
  </name>

tests/data/test33

@@ -7,6 +7,9 @@
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP PUT with resume
  </name>

tests/data/test34

@@ -30,6 +30,9 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP GET with chunked Transfer-Encoding
  </name>

tests/data/test36

@@ -26,6 +26,9 @@ a
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP GET with bad chunked Transfer-Encoding
  </name>

tests/data/test37

@@ -8,6 +8,9 @@
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP GET with nothing returned from server
  </name>

tests/data/test38

@@ -12,6 +12,9 @@ todelooooo lalalala yada yada, we know nothing about ranges ;-)
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP resume request without server supporting it
  </name>

tests/data/test39

@@ -12,6 +12,9 @@ blablabla
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP RFC1867-type formposting with filename= and type=
  </name>

tests/data/test4

@@ -14,6 +14,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 Replaced internal and added custom HTTP headers
  </name>

tests/data/test400

@@ -19,6 +19,9 @@ dr-xr-xr-x   5 0        1            512 Oct  1  1997 usr
 #
 # Client-side
 <client>
+<server>
+ftps
+</server>
  <name>
 FTPS dir list PASV
  </name>

tests/data/test401

@@ -5,6 +5,9 @@ moooooooo
 
 # Client-side
 <client>
+<server>
+ftps
+</server>
  <name>
 FTPS download with strict timeout and slow CWD
  </name>

tests/data/test402

@@ -5,6 +5,9 @@ moooooooo
 
 # Client-side
 <client>
+<server>
+ftps
+</server>
 <killserver>
 ftp
 </killserver>

tests/data/test403

@@ -8,6 +8,9 @@
 #
 # Client-side
 <client>
+<server>
+ftps
+</server>
  <name>
 insecure FTPS without permission
  </name>

tests/data/test43

@@ -36,6 +36,9 @@ If this is received, the location following worked
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP Location: following over HTTP proxy
  </name>

tests/data/test44

@@ -12,6 +12,9 @@ blablabla
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP RFC1867-type formposting without Expect: header
  </name>

tests/data/test45

@@ -36,6 +36,9 @@ If this is received, the location following worked
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 simple HTTP Location: without protocol in initial URL
  </name>

tests/data/test46

@@ -17,6 +17,9 @@ This server reply is for testing a simple Location: following
 
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP, get cookies and store in cookie jar
  </name>

tests/data/test47

@@ -13,6 +13,9 @@ Server: test-server/fake
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 simple HTTP 1.0 GET
  </name>

tests/data/test48

@@ -12,6 +12,9 @@ Connection: close
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP with -d and -G and -I
  </name>

tests/data/test49

@@ -34,6 +34,9 @@ body
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP follow redirect with ../
  </name>

tests/data/test5

@@ -14,6 +14,9 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP over proxy
  </name>

tests/data/test50

@@ -34,6 +34,9 @@ body
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP follow redirect with ../../
  </name>

tests/data/test51

@@ -34,6 +34,9 @@ body
 #
 # Client-side
 <client>
+<server>
+http
+</server>
  <name>
 HTTP follow redirect with exessive ../
  </name>