Fixed the 2000-series tests so that the downloaded data is actually checked

tests/FILEFORMAT

@@ -213,9 +213,9 @@ If a CONNECT is used to the server (to emulate HTTPS etc over proxy), the port
 number given in the CONNECT request will be used to identify which test that
 is being run, if the proxy host name is said to start with 'test'.
 
-Set 'option=no-output' to prevent the test script to slap on the --output
+Set option="no-output" to prevent the test script to slap on the --output
 argument that directs the output to a file. The --output is also not added if
-the client/stdout section is used.
+the verify/stdout section is used.
 
 Available substitute variables include:
 %CLIENTIP   - IPv4 address of the client running curl

tests/data/test2000

@@ -11,7 +11,7 @@ multiprotocol
 #
 # Server-side
 <reply>
-<data>
+<data nocheck="1">
 data
     to
       see
@@ -56,5 +56,18 @@ SIZE 2000
 RETR 2000
 QUIT
 </protocol>
+<stdout>
+data
+    to
+      see
+that FTP
+works
+  so does it?
+foo
+   bar
+bar
+   foo
+moo
+</stdout>
 </verify>
 </testcase>

tests/data/test2001

@@ -13,21 +13,21 @@ multiprotocol
 #
 # Server-side
 <reply>
-<data1>
+<data1 nocheck="1">
-HTTP/1.1 200 OK
+HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
+Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
+Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
+ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
+Accept-Ranges: bytes
-Content-Length: 6
+Content-Length: 6
-Connection: close
+Connection: close
-Content-Type: text/html
+Content-Type: text/html
-Funny-head: yesyes
+Funny-head: yesyes
-
+
 -foo-
 </data1>
-<data2>
+<data2 nocheck="1">
 data
     to
       see
@@ -80,5 +80,30 @@ SIZE 20010002
 RETR 20010002
 QUIT
 </protocol>
+<stdout>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+-foo-
+data
+    to
+      see
+that FTP
+works
+  so does it?
+foo
+   bar
+bar
+   foo
+moo
+</stdout>
 </verify>
 </testcase>

tests/data/test2002

@@ -15,21 +15,21 @@ multiprotocol
 #
 # Server-side
 <reply>
-<data1>
+<data1 nocheck="1">
-HTTP/1.1 200 OK
+HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
+Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
+Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
+ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
+Accept-Ranges: bytes
-Content-Length: 6
+Content-Length: 6
-Connection: close
+Connection: close
-Content-Type: text/html
+Content-Type: text/html
-Funny-head: yesyes
+Funny-head: yesyes
-
+
 -foo-
 </data1>
-<data2>
+<data2 nocheck="1">
 data
     to
       see
@@ -37,7 +37,7 @@ that FTP
 works
   so does it?
 </data2>
-<data3>
+<data3 nocheck="1">
 a chunk of
 data
 returned
@@ -92,5 +92,34 @@ filename: /20020003
 mode: octet
 QUIT
 </protocol>
+<stdout>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+-foo-
+data
+    to
+      see
+that FTP
+works
+  so does it?
+foo
+   bar
+bar
+   foo
+moo
+a chunk of
+data
+returned
+ to TFTP client
+</stdout>
 </verify>
 </testcase>

tests/data/test2003

@@ -15,21 +15,21 @@ multiprotocol
 #
 # Server-side
 <reply>
-<data1>
+<data1 nocheck="1">
-HTTP/1.1 200 OK
+HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
+Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
+Server: test-server/fake
-Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
-ETag: "21025-dc7-39462498"
+ETag: "21025-dc7-39462498"
-Accept-Ranges: bytes
+Accept-Ranges: bytes
-Content-Length: 6
+Content-Length: 6
-Connection: close
+Connection: close
-Content-Type: text/html
+Content-Type: text/html
-Funny-head: yesyes
+Funny-head: yesyes
-
+
 -foo-
 </data1>
-<data2>
+<data2 nocheck="1">
 data
     to
       see
@@ -37,7 +37,7 @@ that FTP
 works
   so does it?
 </data2>
-<data3>
+<data3 nocheck="1">
 a chunk of
 data
 returned
@@ -102,5 +102,61 @@ Accept: */*
 
 QUIT
 </protocol>
+<stdout>
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+-foo-
+data
+    to
+      see
+that FTP
+works
+  so does it?
+foo
+   bar
+bar
+   foo
+moo
+a chunk of
+data
+returned
+ to TFTP client
+a chunk of
+data
+returned
+ to TFTP client
+foo
+   bar
+bar
+   foo
+moo
+data
+    to
+      see
+that FTP
+works
+  so does it?
+HTTP/1.1 200 OK
+Date: Thu, 09 Nov 2010 14:49:00 GMT
+Server: test-server/fake
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT
+ETag: "21025-dc7-39462498"
+Accept-Ranges: bytes
+Content-Length: 6
+Connection: close
+Content-Type: text/html
+Funny-head: yesyes
+
+-foo-
+</stdout>
 </verify>
 </testcase>

tests/data/test2004

@@ -13,7 +13,7 @@ multiprotocol
 #
 # Server-side
 <reply>
-<data>
+<data nocheck="1">
 Test data file
 for tftp test
 </data>
@@ -49,6 +49,22 @@ opcode: 1
 filename: /2004
 mode: octet
 </protocol>
+<stdout>
+Test data file
+for tftp test
+This is test data
+for several protocols
+This is test data
+for several protocols
+This is test data
+for several protocols
+This is test data
+for several protocols
+This is test data
+for several protocols
+Test data file
+for tftp test
+</stdout>
 <valgrind>
 disable
 </valgrind>