testsuite: use binary output mode for custom curl test tools

Do not try to convert line-endings to CRLF on Windows by setting stdout
to binary mode, just like the curl tool does if --ascii is not specified.

This should prevent corrupted stdout line-ending output like CRCRLF.

In order to make the previously naive text-aware tests work with
binary mode on Windows, text-mode is disabled for them if it is not
actually part of the test case and line-endings are corrected.

diff --git a/tests/data/test1508 b/tests/data/test1508
index f8607e58a00558a31d00b8172e2f212d776a322d..b276b8b310a2def08b2dbcd75bd4dc98fa9cd8be 100644 (file)
--- a/tests/data/test1508
+++ b/tests/data/test1508
@@ -24,7 +24,7 @@ http://%HOSTIP:%HTTPPORT/path/1508
 
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/stdout1508" mode="text">
+<file name="log/stdout1508">
 We are done
 </file>
 </verify>

diff --git a/tests/data/test1900 b/tests/data/test1900
index 699fb513a0f47414597858d0ee70adafd0abfbb0..04c59a826f768668a1133bd48793c0d862ed9704 100644 (file)
--- a/tests/data/test1900
+++ b/tests/data/test1900
@@ -9,7 +9,7 @@ multi
 
 # Server-side
 <reply>
-<data mode="text">
+<data>
 Adding handle 0
 Handle 0 Completed with status 0
 Adding handle 1

diff --git a/tests/data/test1901 b/tests/data/test1901
index 4967af39bc8a8c1a34f98ab531ce06e24164f091..c087cc3840cb595a199c4db29002d4639dd52a68 100644 (file)
--- a/tests/data/test1901
+++ b/tests/data/test1901
@@ -9,7 +9,7 @@ multi
 
 # Server-side
 <reply>
-<data mode="text">
+<data>
 Adding handle 0
 Handle 0 Completed with status 0
 Adding handle 1

diff --git a/tests/data/test1902 b/tests/data/test1902
index 017a9fe373c26781e3f488888d1829e31de73bed..a634c46afcedf29a9cba5aaf95399ffa1af378f9 100644 (file)
--- a/tests/data/test1902
+++ b/tests/data/test1902
@@ -9,7 +9,7 @@ multi
 
 # Server-side
 <reply>
-<data mode="text">
+<data>
 Adding handle 0
 Handle 0 Completed with status 0
 Adding handle 1

diff --git a/tests/data/test1903 b/tests/data/test1903
index 6a5e86b86d56be874d437180ac2c5e21558a6087..79cae02668ed4f28acb9adb6f042f79afc1d1f30 100644 (file)
--- a/tests/data/test1903
+++ b/tests/data/test1903
@@ -9,7 +9,7 @@ multi
 
 # Server-side
 <reply>
-<data mode="text">
+<data>
 Adding handle 0
 Handle 0 Completed with status 0
 Adding handle 1

diff --git a/tests/data/test500 b/tests/data/test500
index f9b17f37c73f8d46db937b7c13eea01101451462..faf3d72711641cb17fe412c1c2810aed45721b84 100644 (file)
--- a/tests/data/test500
+++ b/tests/data/test500
@@ -8,18 +8,18 @@ HTTP GET
 #
 # Server-side
 <reply name="1">
-<data mode="text">
-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
-
+<data>
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 -foo-
 </data>
 </reply>
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/500 log/ip500
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip500" mode="text">
+<file name="log/ip500">
 IP: %HOSTIP
 </file>
 <protocol>

diff --git a/tests/data/test502 b/tests/data/test502
index f73a4eb30b6b97074c0856e30a2d513179868944..f8d776b6c8dd05b0c9840e10b62be4c58fcd378a 100644 (file)
--- a/tests/data/test502
+++ b/tests/data/test502
@@ -7,7 +7,7 @@ FILE
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 foo
    bar swsclose
 bar

diff --git a/tests/data/test506 b/tests/data/test506
index 630e81651908e559f9f4dbf0144eab6eae759352..f9d2be4b4d2721aea420d8f8e496b740b371e29b 100644 (file)
--- a/tests/data/test506
+++ b/tests/data/test506
@@ -72,7 +72,7 @@ http://%HOSTIP:%HTTPPORT/506
 
 # Verify data after the test has been "shot"
 <verify>
-<stdout mode="text">
+<stdout>
 GLOBAL_INIT
 SHARE_INIT
 CURLSHOPT_LOCKFUNC

diff --git a/tests/data/test508 b/tests/data/test508
index 5cd4b8c3427c6658e29346030949d62d299bb868..44a8bb59104cf3fb6c72c947cbd26b8241e73fc6 100644 (file)
--- a/tests/data/test508
+++ b/tests/data/test508
@@ -2,13 +2,13 @@
 #
 # Server-side
 <reply>
-<data mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake swsclose
-Connection: close
-Content-Type: text/html
-
+<data>
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake swsclose\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 hello
 </data>
 </reply>

diff --git a/tests/data/test509 b/tests/data/test509
index a6ee7474c18190f3332c437039fef1fd3ab347f1..b467d65f85a8525eef478cd4f3cbc11e8d0badf8 100644 (file)
--- a/tests/data/test509
+++ b/tests/data/test509
@@ -28,7 +28,7 @@ nothing
 #
 # Verify data after the test has been "shot"
 <verify>
-<stdout mode="text">
+<stdout>
 seen custom_calloc()
 seen custom_malloc()
 seen custom_realloc()

diff --git a/tests/data/test510 b/tests/data/test510
index f1f1a3ceb62ec5fbebe5a502d0ac9359dd18869c..5ba0a7fe9804e8f35b5c77d20540f1ed5c4af0d1 100644 (file)
--- a/tests/data/test510
+++ b/tests/data/test510
@@ -9,13 +9,13 @@ HTTP POST
 #
 # Server-side
 <reply>
-<data mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake swsclose
-Connection: close
-Content-Type: text/html
-
+<data>
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake swsclose\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 hello
 </data>
 </reply>

diff --git a/tests/data/test512 b/tests/data/test512
index ce644db6f3bece050703759d9e303cb8f8120a2b..d259f40dff04c9859951b993abdfb30f0ee0771e 100644 (file)
--- a/tests/data/test512
+++ b/tests/data/test512
@@ -9,7 +9,7 @@ HTTP GET
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 200 OK swsclose\r
 Date: Thu, 09 Nov 2010 14:49:00 GMT\r
 Server: yes\r

diff --git a/tests/data/test514 b/tests/data/test514
index a8e66eaad22db6dd52b81e909d0de2fab50873fa..ca37a5d659e9e9d0e5dd31712508f06300aa93ce 100644 (file)
--- a/tests/data/test514
+++ b/tests/data/test514
@@ -8,18 +8,18 @@ HTTP HEAD
 #
 # Server-side
 <reply>
-<data mode="text">
-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
-
+<data>
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 </data>
 </reply>
 

diff --git a/tests/data/test515 b/tests/data/test515
index d139f29484dad57e26b100f0d3c142b93f1a6f6b..526f1e136aa38a28c9c13236402f7dfb29f46288 100644 (file)
--- a/tests/data/test515
+++ b/tests/data/test515
@@ -8,12 +8,12 @@ HTTP POST
 #
 # Server-side
 <reply>
-<data mode="text">
-HTTP/1.1 200 OK swsclose
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 3
-
+<data>
+HTTP/1.1 200 OK swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 3\r
+\r
 OK
 </data>
 </reply>

diff --git a/tests/data/test516 b/tests/data/test516
index 93f21d6ef1045015655d836fd31f13d2d0be11b1..9bc175bd4cdf31fd3a77085a42ebc17a2a7601c1 100644 (file)
--- a/tests/data/test516
+++ b/tests/data/test516
@@ -9,12 +9,12 @@ HTTP POST
 #
 # Server-side
 <reply>
-<data mode="text">
-HTTP/1.1 200 OK swsclose
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 3
-
+<data>
+HTTP/1.1 200 OK swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 3\r
+\r
 OK
 </data>
 </reply>

diff --git a/tests/data/test517 b/tests/data/test517
index 7b703b467423acdf359b4b9e91fcc2ab9002d698..f0cb5a8fd7c66b81cba0a11e0150588c1175fb31 100644 (file)
--- a/tests/data/test517
+++ b/tests/data/test517
@@ -25,7 +25,7 @@ nothing
 #
 # Verify data after the test has been "shot"
 <verify>
-<stdout mode="text">
+<stdout>
 0: Sun, 06 Nov 1994 08:49:37 GMT => 784111777
 1: Sunday, 06-Nov-94 08:49:37 GMT => 784111777
 2: Sun Nov  6 08:49:37 1994 => 784111777

diff --git a/tests/data/test519 b/tests/data/test519
index 1a9768d0e660c263fcc56222d7d6bd58d9ad23d0..b8ca9ab23f15f06fdc05528ae6160ee949406216 100644 (file)
--- a/tests/data/test519
+++ b/tests/data/test519
@@ -9,34 +9,34 @@ HTTP GET
 #
 # Server-side
 <reply>
-<data mode="text">
-HTTP/1.1 200 OK swsbounce
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 8
-
+<data>
+HTTP/1.1 200 OK swsbounce\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 8\r
+\r
 content
 </data>
 <data1>
-HTTP/1.1 200 OK swsclose
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 9
-
+HTTP/1.1 200 OK swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 9\r
+\r
 content2
 </data1>
 <datacheck>
-HTTP/1.1 200 OK swsbounce
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 8
-
+HTTP/1.1 200 OK swsbounce\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 8\r
+\r
 content
-HTTP/1.1 200 OK swsclose
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 9
-
+HTTP/1.1 200 OK swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 9\r
+\r
 content2
 </datacheck>
 </reply>

diff --git a/tests/data/test522 b/tests/data/test522
index 5eb114bae4ad4ccd94ff5a7bf75a108ece3f1b6b..56d1f3be9a428bd1402e02239f74eb45bf9fe1fd 100644 (file)
--- a/tests/data/test522
+++ b/tests/data/test522
@@ -53,7 +53,7 @@ Host: %HOSTIP:%HTTPPORT
 Accept: */*\r
 \r
 </protocol>
-<stdout mode="text">
+<stdout>
 hello
 </stdout>
 </verify>

diff --git a/tests/data/test523 b/tests/data/test523
index 22c421ec4dc4561d5e94394d561c7de1c432644b..7d3db38ef082453bae061ddd5300c8e4d6d4841e 100644 (file)
--- a/tests/data/test523
+++ b/tests/data/test523
@@ -57,7 +57,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
-<stdout mode="text">
+<stdout>
 hello
 </stdout>
 </verify>

diff --git a/tests/data/test535 b/tests/data/test535
index 85515a1b26690f5d41c656b4b21339e6ac10cf89..6837d2a61a0902ab0242ae8e2e82c2ac581b6ca6 100644 (file)
--- a/tests/data/test535
+++ b/tests/data/test535
@@ -8,23 +8,23 @@ multi
 </info>
 
 <reply>
-<data mode="text">
-HTTP/1.1 404 Badness
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-ETag: "21025-dc7-39462498"
-Content-Length: 6
-Content-Type: text/html
-Funny-head: yesyes
-
+<data>
+HTTP/1.1 404 Badness\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Content-Length: 6\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 hejsan
 </data>
 <data1>
-HTTP/1.1 200 Fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Content-Length: 13
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 Fine\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Content-Length: 13\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 fine content
 </data1>
 

diff --git a/tests/data/test536 b/tests/data/test536
index 51cde158f79fa6eae133eea86fd62f47ecb898f5..51ac9716f8573368215ff45e1fce048cbe5ca3b6 100644 (file)
--- a/tests/data/test536
+++ b/tests/data/test536
@@ -9,23 +9,23 @@ multi
 </info>
 
 <reply>
-<data mode="text">
-HTTP/1.1 404 Badness
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-ETag: "21025-dc7-39462498"
-Content-Length: 6
-Content-Type: text/html
-Funny-head: yesyes
-
+<data>
+HTTP/1.1 404 Badness\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Content-Length: 6\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 hejsan
 </data>
 <data1>
-HTTP/1.1 200 Fine
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Content-Length: 13
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 Fine\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Content-Length: 13\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 fine content
 </data1>
 

diff --git a/tests/data/test539 b/tests/data/test539
index 593fcac1a7f502bfa9eedac4b3e4ba0e54149e6f..eaa64d51858b21451b7abd7cbef5ea716a08dbfd 100644 (file)
--- a/tests/data/test539
+++ b/tests/data/test539
@@ -8,7 +8,7 @@ FTP
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 file contents
 </data>
 

diff --git a/tests/data/test543 b/tests/data/test543
index df5c1dfbb1e4df732edd86a6ae23c898216d50ab..455633037589d2659be9162b1921fc9b6aabaef3 100644 (file)
--- a/tests/data/test543
+++ b/tests/data/test543
@@ -28,7 +28,7 @@ curl_easy_escape
 # There's no MTDM in the protocol here since this code doesn't ask for the
 # time/date of the file
 <verify>
-<stdout mode="text">
+<stdout>
 %9C%26K%3DI%04%A1%01%E0%D8%7C%20%B7%EFS%29%FA%1DW%E1
 </stdout>
 </verify>

diff --git a/tests/data/test544 b/tests/data/test544
index 963baec78be7ee2d0b4c0a4b726a468ec984cf92..78cb5a45e113186740e76af66c467e7d65dce700 100644 (file)
--- a/tests/data/test544
+++ b/tests/data/test544
@@ -9,12 +9,12 @@ HTTP POST
 #
 # Server-side
 <reply>
-<data mode="text">
-HTTP/1.1 200 OK swsclose
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake
-Content-Length: 3
-
+<data>
+HTTP/1.1 200 OK swsclose\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Content-Length: 3\r
+\r
 OK
 </data>
 </reply>

diff --git a/tests/data/test545 b/tests/data/test545
index 11e3fb9f331e75eb9d723be96143a7e481875fb8..0bba688aef66040f042805bc1dcc2a78cbe7b7e9 100644 (file)
Binary files a/tests/data/test545 and b/tests/data/test545 differ

diff --git a/tests/data/test549 b/tests/data/test549
index 9ef6ec939c60d3c3db09242d04b3fd2f822aec6e..a248edbf61cdda5e93eaef4508a7f002e3caf469 100644 (file)
--- a/tests/data/test549
+++ b/tests/data/test549
@@ -58,7 +58,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
-<stdout mode="text">
+<stdout>
 hello
 </stdout>
 </verify>

diff --git a/tests/data/test550 b/tests/data/test550
index 8fd99a7fd821a68d641cc1b0afeb4f4c33990213..a609aa216d126aab345d78c81706f36749346d56 100644 (file)
--- a/tests/data/test550
+++ b/tests/data/test550
@@ -58,7 +58,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
-<stdout mode="text">
+<stdout>
 hello
 </stdout>
 </verify>

diff --git a/tests/data/test554 b/tests/data/test554
index b08d7741f7f5b86557ce0f605ba337dbb6edb291..b55fa3d104fa20e3e41223bbc82013c7a4e14240 100644 (file)
--- a/tests/data/test554
+++ b/tests/data/test554
@@ -9,13 +9,13 @@ HTTP POST
 #
 # Server-side
 <reply>
-<data mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Server: test-server/fake swsclose
-Connection: close
-Content-Type: text/html
-
+<data>
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake swsclose\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 hello
 </data>
 </reply>

diff --git a/tests/data/test557 b/tests/data/test557
index 3da67e99fc45eb49dcc10e77d97d70bb07661def..493cc2289becfb4ca42efcacf1f127505571f654 100644 (file)
--- a/tests/data/test557
+++ b/tests/data/test557
@@ -25,7 +25,7 @@ nothing
 #
 # Verify data after the test has been "shot"
 <verify>
-<stdout mode="text">
+<stdout>
 All curl_mprintf() unsigned short tests OK!
 All curl_mprintf() signed short tests OK!
 All curl_mprintf() unsigned int tests OK!

diff --git a/tests/data/test558 b/tests/data/test558
index f8cbfbe8de2229190917540dabbd3bc71fcd13b7..7a9ba70619505c2c6f6003ee72fa89c7ecebd08a 100644 (file)
--- a/tests/data/test558
+++ b/tests/data/test558
@@ -34,7 +34,7 @@ nothing
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/memdump" mode="text">
+<file name="log/memdump">
 MEM lib558.c: malloc()
 MEM lib558.c: free()
 MEM escape.c: malloc()

diff --git a/tests/data/test561 b/tests/data/test561
index 9f437f58d372fb7eed3deaa34dbf98d020fe8602..a6188eacfea2c256d087e8ce509a7d1a21257076 100644 (file)
--- a/tests/data/test561
+++ b/tests/data/test561
@@ -59,7 +59,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
-<stdout mode="text">
+<stdout>
 hello
 </stdout>
 </verify>

diff --git a/tests/data/test566 b/tests/data/test566
index 95da61d2d5869368532bb2343432f27dccf664e5..9923d8fb805b67e14ea2e057c47dd60beceb6b55 100644 (file)
--- a/tests/data/test566
+++ b/tests/data/test566
@@ -8,18 +8,18 @@ HTTP GET
 #
 # Server-side
 <reply>
-<data mode="text">
-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: 0
-Connection: close
-Content-Type: text/html
-Funny-head: yesyes
-
+<data>
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 0\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 </data>
 </reply>
 
@@ -44,7 +44,7 @@ http://%HOSTIP:%HTTPPORT/566 log/ip566
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip566" mode="text">
+<file name="log/ip566">
 CL: 0
 </file>
 <protocol>

diff --git a/tests/data/test571 b/tests/data/test571
index bedb5e9201811f0427a48c96b6b16212e308cadc..5e138cdf98bca689cd92fc64dc70f50d935450d9 100644 (file)
--- a/tests/data/test571
+++ b/tests/data/test571
@@ -83,7 +83,7 @@ rtsp://%HOSTIP:%RTSPPORT/571 log/protofile.txt
 </client>
 
 <verify>
-<stdout mode="text">
+<stdout>
 RTP: message size 10, channel 1
 RTP: message size 500, channel 0
 RTP: message size 196, channel 0

diff --git a/tests/data/test574 b/tests/data/test574
index 1fa4654d4e13f474bfb94961e137f3926f32225c..c1584480cab365d25d8183a8676feb71d539a010 100644 (file)
--- a/tests/data/test574
+++ b/tests/data/test574
@@ -82,7 +82,7 @@ EPSV
 RETR someothertext.txt\r
 QUIT\r
 </protocol>
-<stdout mode="text">
+<stdout>
 This file should have permissions 444
 This file should have permissions 666
 This file should have permissions 777

diff --git a/tests/data/test575 b/tests/data/test575
index 5670e6bc63acfbf5bfde7c7cf016717841f7fbfd..8133834560ceec6fdb808f3ca49c1740a796265f 100644 (file)
--- a/tests/data/test575
+++ b/tests/data/test575
@@ -100,7 +100,7 @@ EPSV
 RETR someothertext.txt\r
 QUIT\r
 </protocol>
-<stdout mode="text">
+<stdout>
 This file should have permissions 444
 This file should have permissions 666
 This file should have permissions 777

diff --git a/tests/data/test576 b/tests/data/test576
index 4d4b90c8031c16376049d9bc5e1784f4f9049979..52a6664f1abbaf41cf129e30f62db26ddedbc47e 100644 (file)
--- a/tests/data/test576
+++ b/tests/data/test576
@@ -34,7 +34,7 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*
 <errorcode>
 0
 </errorcode>
-<stdout mode="text">
+<stdout>
 =============================================================
 Remains:      14
 Filename:     .

diff --git a/tests/data/test578 b/tests/data/test578
index 0b6a4373160259fc06780c706be9b94c219209b3..e4ee4ac17cfb90a19ccf3788cf3a3e7396a10de2 100644 (file)
--- a/tests/data/test578
+++ b/tests/data/test578
@@ -8,18 +8,18 @@ HTTP POST
 #
 # Server-side
 <reply name="1">
-<data mode="text">
-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
-
+<data>
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Server: test-server/fake\r
+Last-Modified: Tue, 13 Jun 2000 12:10:00 GMT\r
+ETag: "21025-dc7-39462498"\r
+Accept-Ranges: bytes\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+Funny-head: yesyes\r
+\r
 -foo-
 </data>
 </reply>
@@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/500 log/ip578
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip578" mode="text">
+<file name="log/ip578">
 PASSED, UL data matched data size
 </file>
 </verify>

diff --git a/tests/data/test579 b/tests/data/test579
index d21be1be1aef248ac6a409c90b5c2cdbdc607491..11c81a428789c40e6b27d15d77ac2e79b82634cf 100644 (file)
--- a/tests/data/test579
+++ b/tests/data/test579
@@ -72,7 +72,7 @@ http://%HOSTIP:%HTTPPORT/579 log/ip579
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip579" mode="text">
+<file name="log/ip579">
 Progress callback called with UL 0 out of 0
 Progress callback called with UL 0 out of -1
 Progress callback called with UL 8 out of -1

diff --git a/tests/data/test584 b/tests/data/test584
index 582a91120b578dc26a65d5e6cb85147fb659e764..309c7b65b1f57e71cc95955b9de9227e4e0c1e06 100644 (file)
--- a/tests/data/test584
+++ b/tests/data/test584
@@ -11,31 +11,31 @@ multi
 # Silly division of the first request is solely to appease the server which expects n_data_items == n_requests
 <reply>
 <data1>
-HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 4
-
+HTTP/1.1 200 OK\r
+Server: test-server/fake\r
+Content-Length: 4\r
+\r
 584
 </data1>
 <data2>
-HTTP/1.1 200 OK
+HTTP/1.1 200 OK\r
 </data2>
 <data3>
-Server: test-server/fake
+Server: test-server/fake\r
 </data3>
 <data4>
-Content-Length: 0
-
-HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 5
-
+Content-Length: 0\r
+\r
+HTTP/1.1 200 OK\r
+Server: test-server/fake\r
+Content-Length: 5\r
+\r
 585
 
-HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 4
-
+HTTP/1.1 200 OK\r
+Server: test-server/fake\r
+Content-Length: 4\r
+\r
 586
 </data4>
 </reply>
@@ -76,26 +76,26 @@ Host: %HOSTIP:%HTTPPORT
 Accept: */*\r
 \r
 </protocol>
-<stdout mode="text">
-HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 4
-
+<stdout>
+HTTP/1.1 200 OK\r
+Server: test-server/fake\r
+Content-Length: 4\r
+\r
 584
-HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 0
-
-HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 5
-
+HTTP/1.1 200 OK\r
+Server: test-server/fake\r
+Content-Length: 0\r
+\r
+HTTP/1.1 200 OK\r
+Server: test-server/fake\r
+Content-Length: 5\r
+\r
 585
 
-HTTP/1.1 200 OK
-Server: test-server/fake
-Content-Length: 4
-
+HTTP/1.1 200 OK\r
+Server: test-server/fake\r
+Content-Length: 4\r
+\r
 586
 </stdout>
 </verify>

diff --git a/tests/data/test598 b/tests/data/test598
index f43bbacd04e79b954b8ed0ce5c0f7529034c8e66..11a0dbc3c6d40bcb6e460e5699e7f522789be3f9 100644 (file)
--- a/tests/data/test598
+++ b/tests/data/test598
@@ -12,31 +12,31 @@ curl_easy_reset
 #
 # Server-side
 <reply>
-<data mode="text">
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+<data>
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 -foo-
 </data>
 
 # since the request runs twice
 <datacheck>
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 -foo-
-HTTP/1.1 200 OK
-Date: Thu, 09 Nov 2010 14:49:00 GMT
-Content-Length: 6
-Connection: close
-Content-Type: text/html
-
+HTTP/1.1 200 OK\r
+Date: Thu, 09 Nov 2010 14:49:00 GMT\r
+Content-Length: 6\r
+Connection: close\r
+Content-Type: text/html\r
+\r
 -foo-
 </datacheck>
 

diff --git a/tests/libtest/first.c b/tests/libtest/first.c
index 253acb21ddef0e80317e725edb2ca6d9a4ab72ab..9ab7dc7583b0ec2e71731d67e4a582582e30cf3c 100644 (file)
--- a/tests/libtest/first.c
+++ b/tests/libtest/first.c
@@ -22,7 +22,15 @@
 #include "test.h"
 
 #ifdef HAVE_LOCALE_H
-#include <locale.h> /* for setlocale() */
+#  include <locale.h> /* for setlocale() */
+#endif
+
+#ifdef HAVE_IO_H
+#  include <io.h> /* for setmode() */
+#endif
+
+#ifdef HAVE_FCNTL_H
+#  include <fcntl.h> /* for setmode() */
 #endif
 
 #ifdef CURLDEBUG
@@ -98,6 +106,14 @@ int main(int argc, char **argv)
 {
   char *URL;
 
+#ifdef O_BINARY
+#  ifdef __HIGHC__
+  _setmode(stdout, O_BINARY);
+#  else
+  setmode(fileno(stdout), O_BINARY);
+#  endif
+#endif
+
   memory_tracking_init();
 
   /*