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.
2024-12-21 23:58:49 -05:00 · 2014-02-01 00:58:58 +01:00 · 2014-02-01 00:58:58 +01:00 · 75f00de55c
commit 75f00de55c
parent 69745aaa45
41 changed files with 232 additions and 216 deletions
--- 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>
--- 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
--- 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
--- 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
--- 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
--- a/tests/data/test500
+++ b/tests/data/test500
@ -8,7 +8,7 @@ HTTP GET
 #
 # Server-side
 <reply name="1">
-<data mode="text">
+<data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@ -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>
--- a/tests/data/test502
+++ b/tests/data/test502
@ -7,7 +7,7 @@ FILE
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 foo
   bar swsclose
 bar
--- 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
--- a/tests/data/test508
+++ b/tests/data/test508
@ -2,7 +2,7 @@
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
--- 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()
--- a/tests/data/test510
+++ b/tests/data/test510
@ -9,7 +9,7 @@ HTTP POST
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
--- 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
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: yes
--- a/tests/data/test514
+++ b/tests/data/test514
@ -8,7 +8,7 @@ HTTP HEAD
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
--- a/tests/data/test515
+++ b/tests/data/test515
@ -8,7 +8,7 @@ HTTP POST
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
--- a/tests/data/test516
+++ b/tests/data/test516
@ -9,7 +9,7 @@ HTTP POST
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
--- 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
--- a/tests/data/test519
+++ b/tests/data/test519
@ -9,7 +9,7 @@ HTTP GET
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 200 OK swsbounce
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
--- a/tests/data/test522
+++ b/tests/data/test522
@ -53,7 +53,7 @@ Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
-<stdout mode="text">
+<stdout>
 hello
 </stdout>
 </verify>
--- a/tests/data/test523
+++ b/tests/data/test523
@ -57,7 +57,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive

 </protocol>
-<stdout mode="text">
+<stdout>
 hello
 </stdout>
 </verify>
--- a/tests/data/test535
+++ b/tests/data/test535
@ -8,7 +8,7 @@ multi
 </info>

 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 404 Badness
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 ETag: "21025-dc7-39462498"
--- a/tests/data/test536
+++ b/tests/data/test536
@ -9,7 +9,7 @@ multi
 </info>

 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 404 Badness
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 ETag: "21025-dc7-39462498"
--- a/tests/data/test539
+++ b/tests/data/test539
@ -8,7 +8,7 @@ FTP
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 file contents
 </data>

--- 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>
--- a/tests/data/test544
+++ b/tests/data/test544
@ -9,7 +9,7 @@ HTTP POST
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 200 OK swsclose
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
--- a/tests/data/test545
+++ b/tests/data/test545
--- a/tests/data/test549
+++ b/tests/data/test549
@ -58,7 +58,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive

 </protocol>
-<stdout mode="text">
+<stdout>
 hello
 </stdout>
 </verify>
--- a/tests/data/test550
+++ b/tests/data/test550
@ -58,7 +58,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive

 </protocol>
-<stdout mode="text">
+<stdout>
 hello
 </stdout>
 </verify>
--- a/tests/data/test554
+++ b/tests/data/test554
@ -9,7 +9,7 @@ HTTP POST
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake swsclose
--- 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!
--- 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()
--- a/tests/data/test561
+++ b/tests/data/test561
@ -59,7 +59,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive

 </protocol>
-<stdout mode="text">
+<stdout>
 hello
 </stdout>
 </verify>
--- a/tests/data/test566
+++ b/tests/data/test566
@ -8,7 +8,7 @@ HTTP GET
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@ -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>
--- 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
--- a/tests/data/test574
+++ b/tests/data/test574
@ -82,7 +82,7 @@ EPSV
 RETR someothertext.txt
 QUIT
 </protocol>
-<stdout mode="text">
+<stdout>
 This file should have permissions 444
 This file should have permissions 666
 This file should have permissions 777
--- a/tests/data/test575
+++ b/tests/data/test575
@ -100,7 +100,7 @@ EPSV
 RETR someothertext.txt
 QUIT
 </protocol>
-<stdout mode="text">
+<stdout>
 This file should have permissions 444
 This file should have permissions 666
 This file should have permissions 777
--- 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:     .
--- a/tests/data/test578
+++ b/tests/data/test578
@ -8,7 +8,7 @@ HTTP POST
 #
 # Server-side
 <reply name="1">
-<data mode="text">
+<data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@ -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>
--- 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
--- a/tests/data/test584
+++ b/tests/data/test584
@ -76,7 +76,7 @@ Host: %HOSTIP:%HTTPPORT
 Accept: */*

 </protocol>
-<stdout mode="text">
+<stdout>
 HTTP/1.1 200 OK
 Server: test-server/fake
 Content-Length: 4
--- a/tests/data/test598
+++ b/tests/data/test598
@ -12,7 +12,7 @@ curl_easy_reset
 #
 # Server-side
 <reply>
-<data mode="text">
+<data>
 HTTP/1.1 200 OK
 Date: Thu, 09 Nov 2010 14:49:00 GMT
 Content-Length: 6
--- 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();

  /*