moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Marc Hoersken 2014-02-01 00:58:58 +01:00
parent 69745aaa45
commit 75f00de55c
41 changed files with 232 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/data/test1508
View File

@ -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>

2
tests/data/test1900
View File

@ -9,7 +9,7 @@ multi
# Server-side
<reply>
<data mode="text">
<data>
Adding handle 0
Handle 0 Completed with status 0
Adding handle 1

2
tests/data/test1901
View File

@ -9,7 +9,7 @@ multi
# Server-side
<reply>
<data mode="text">
<data>
Adding handle 0
Handle 0 Completed with status 0
Adding handle 1

2
tests/data/test1902
View File

@ -9,7 +9,7 @@ multi
# Server-side
<reply>
<data mode="text">
<data>
Adding handle 0
Handle 0 Completed with status 0
Adding handle 1

2
tests/data/test1903
View File

@ -9,7 +9,7 @@ multi
# Server-side
<reply>
<data mode="text">
<data>
Adding handle 0
Handle 0 Completed with status 0
Adding handle 1

26
tests/data/test500
View File

@ -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
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>
</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>

2
tests/data/test502
View File

@ -7,7 +7,7 @@ FILE
#
# Server-side
<reply>
<data mode="text">
<data>
foo
bar swsclose
bar

2
tests/data/test506
View File

@ -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

14
tests/data/test508
View File

@ -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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake swsclose
Connection: close
Content-Type: text/html
hello
</data>
</reply>

2
tests/data/test509
View File

@ -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()

14
tests/data/test510
View File

@ -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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake swsclose
Connection: close
Content-Type: text/html
hello
</data>
</reply>

2
tests/data/test512
View File

@ -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

24
tests/data/test514
View File

@ -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
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>
</reply>

12
tests/data/test515
View File

@ -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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
Content-Length: 3
OK
</data>
</reply>

12
tests/data/test516
View File

@ -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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
Content-Length: 3
OK
</data>
</reply>

2
tests/data/test517
View File

@ -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

42
tests/data/test519
View File

@ -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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
Content-Length: 8
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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
Content-Length: 9
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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
Content-Length: 8
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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
Content-Length: 9
content2
</datacheck>
</reply>

2
tests/data/test522
View File

@ -53,7 +53,7 @@ Host: %HOSTIP:%HTTPPORT
Accept: */*
</protocol>
<stdout mode="text">
<stdout>
hello
</stdout>
</verify>

2
tests/data/test523
View File

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

28
tests/data/test535
View File

@ -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
Date: Thu, 09 Nov 2010 14:49:00 GMT
ETag: "21025-dc7-39462498"
Content-Length: 6
Content-Type: text/html
Funny-head: yesyes
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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Content-Length: 13
Connection: close
Content-Type: text/html
fine content
</data1>

28
tests/data/test536
View File

@ -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
Date: Thu, 09 Nov 2010 14:49:00 GMT
ETag: "21025-dc7-39462498"
Content-Length: 6
Content-Type: text/html
Funny-head: yesyes
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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Content-Length: 13
Connection: close
Content-Type: text/html
fine content
</data1>

2
tests/data/test539
View File

@ -8,7 +8,7 @@ FTP
#
# Server-side
<reply>
<data mode="text">
<data>
file contents
</data>

2
tests/data/test543
View File

@ -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>

12
tests/data/test544
View File

@ -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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake
Content-Length: 3
OK
</data>
</reply>

BIN
tests/data/test545
View File

Binary file not shown.

2
tests/data/test549
View File

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

2
tests/data/test550
View File

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

14
tests/data/test554
View File

@ -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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: test-server/fake swsclose
Connection: close
Content-Type: text/html
hello
</data>
</reply>

2
tests/data/test557
View File

@ -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!

2
tests/data/test558
View File

@ -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()

2
tests/data/test561
View File

@ -59,7 +59,7 @@ Accept: */*
Proxy-Connection: Keep-Alive
</protocol>
<stdout mode="text">
<stdout>
hello
</stdout>
</verify>

26
tests/data/test566
View File

@ -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
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>
</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>

2
tests/data/test571
View File

@ -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

2
tests/data/test574
View File

@ -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

2
tests/data/test575
View File

@ -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

2
tests/data/test576
View File

@ -34,7 +34,7 @@ ftp://%HOSTIP:%FTPPORT/fully_simulated/UNIX/*
<errorcode>
0
</errorcode>
<stdout mode="text">
<stdout>
=============================================================
Remains: 14
Filename: .

26
tests/data/test578
View File

@ -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
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>
</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>

2
tests/data/test579
View File

@ -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

66
tests/data/test584
View File

@ -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
Server: test-server/fake
Content-Length: 4
584
</data1>
<data2>
HTTP/1.1 200 OK
HTTP/1.1 200 OK
</data2>
<data3>
Server: test-server/fake
Server: test-server/fake
</data3>
<data4>
Content-Length: 0
HTTP/1.1 200 OK
Server: test-server/fake
Content-Length: 5
Content-Length: 0
HTTP/1.1 200 OK
Server: test-server/fake
Content-Length: 5
585
HTTP/1.1 200 OK
Server: test-server/fake
Content-Length: 4
HTTP/1.1 200 OK
Server: test-server/fake
Content-Length: 4
586
</data4>
</reply>
@ -76,26 +76,26 @@ Host: %HOSTIP:%HTTPPORT
Accept: */*
</protocol>
<stdout mode="text">
HTTP/1.1 200 OK
Server: test-server/fake
Content-Length: 4
<stdout>
HTTP/1.1 200 OK
Server: test-server/fake
Content-Length: 4
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
Server: test-server/fake
Content-Length: 0
HTTP/1.1 200 OK
Server: test-server/fake
Content-Length: 5
585
HTTP/1.1 200 OK
Server: test-server/fake
Content-Length: 4
HTTP/1.1 200 OK
Server: test-server/fake
Content-Length: 4
586
</stdout>
</verify>

38
tests/data/test598
View File

@ -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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Content-Length: 6
Connection: close
Content-Type: text/html
-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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Content-Length: 6
Connection: close
Content-Type: text/html
-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
Date: Thu, 09 Nov 2010 14:49:00 GMT
Content-Length: 6
Connection: close
Content-Type: text/html
-foo-
</datacheck>

18
tests/libtest/first.c
View File

@ -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();
/*