diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/data/test500 | 2 | ||||
| -rw-r--r-- | tests/data/test502 | 2 | ||||
| -rw-r--r-- | tests/data/test506 | 6 | ||||
| -rw-r--r-- | tests/data/test508 | 2 | ||||
| -rw-r--r-- | tests/data/test510 | 2 | ||||
| -rw-r--r-- | tests/data/test512 | 2 | ||||
| -rw-r--r-- | tests/data/test514 | 2 | ||||
| -rw-r--r-- | tests/data/test515 | 2 | ||||
| -rw-r--r-- | tests/data/test516 | 2 | ||||
| -rw-r--r-- | tests/data/test519 | 2 | ||||
| -rw-r--r-- | tests/data/test522 | 2 | ||||
| -rwxr-xr-x | tests/runtests.pl | 8 |
12 files changed, 21 insertions, 13 deletions
diff --git a/tests/data/test500 b/tests/data/test500 index 95e2b260d..eafd13825 100644 --- a/tests/data/test500 +++ b/tests/data/test500 @@ -1,7 +1,7 @@ # # Server-side <reply name="1"> -<data> +<data mode="text"> HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test502 b/tests/data/test502 index bd8607fb9..4ef6e5d9c 100644 --- a/tests/data/test502 +++ b/tests/data/test502 @@ -1,7 +1,7 @@ # # Server-side <reply> -<data> +<data mode="text"> foo bar swsclose bar diff --git a/tests/data/test506 b/tests/data/test506 index c89bbed94..3c02702bf 100644 --- a/tests/data/test506 +++ b/tests/data/test506 @@ -35,7 +35,7 @@ Content-Type: text/html Content-Length: 32 run 3: overwrite cookie 1 and 4 -</data5> +</data3> </reply> # Client-side @@ -56,7 +56,7 @@ http://%HOSTIP:%HTTPPORT/506 # Verify data after the test has been "shot" <verify> -<stdout> +<stdout mode="text"> GLOBAL_INIT SHARE_INIT CURL_LOCK_DATA_COOKIE @@ -145,7 +145,7 @@ GLOBAL_CLEANUP <stderr> http://%HOSTIP:%HTTPPORT/506 </stderr> -<file name="log/jar506"> +<file name="log/jar506" mode="text"> # Netscape HTTP Cookie File # http://www.netscape.com/newsref/std/cookie_spec.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test508 b/tests/data/test508 index 7940b1260..3d3c6c9e0 100644 --- a/tests/data/test508 +++ b/tests/data/test508 @@ -1,7 +1,7 @@ # # Server-side <reply> -<data> +<data mode="text"> HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose diff --git a/tests/data/test510 b/tests/data/test510 index 22b0aad2d..79c2d11a6 100644 --- a/tests/data/test510 +++ b/tests/data/test510 @@ -1,7 +1,7 @@ # # Server-side <reply> -<data> +<data mode="text"> HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake swsclose diff --git a/tests/data/test512 b/tests/data/test512 index c6e3dbad4..1df968b36 100644 --- a/tests/data/test512 +++ b/tests/data/test512 @@ -1,7 +1,7 @@ # # Server-side <reply> -<data> +<data mode=text> HTTP/1.1 200 OK swsclose
Date: Thu, 09 Nov 2010 14:49:00 GMT
Server: yes
diff --git a/tests/data/test514 b/tests/data/test514 index eed0da56e..5db18b356 100644 --- a/tests/data/test514 +++ b/tests/data/test514 @@ -1,7 +1,7 @@ # # Server-side <reply> -<data> +<data mode="text"> HTTP/1.1 200 OK Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test515 b/tests/data/test515 index 65d0f96aa..f6be8c42c 100644 --- a/tests/data/test515 +++ b/tests/data/test515 @@ -1,7 +1,7 @@ # # Server-side <reply> -<data> +<data mode="text"> HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test516 b/tests/data/test516 index e1c890ac1..cd45b3115 100644 --- a/tests/data/test516 +++ b/tests/data/test516 @@ -1,7 +1,7 @@ # # Server-side <reply> -<data> +<data mode="text"> HTTP/1.1 200 OK swsclose Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test519 b/tests/data/test519 index d9adfdde2..e86acabd2 100644 --- a/tests/data/test519 +++ b/tests/data/test519 @@ -1,7 +1,7 @@ # # Server-side <reply> -<data> +<data mode="text"> HTTP/1.1 200 OK swsbounce Date: Thu, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test522 b/tests/data/test522 index 6578e33c4..753526c84 100644 --- a/tests/data/test522 +++ b/tests/data/test522 @@ -52,7 +52,7 @@ Host: 127.0.0.1:%HTTPPORT Accept: */*
</protocol> -<stdout> +<stdout mode="text"> hello </stdout> </verify> diff --git a/tests/runtests.pl b/tests/runtests.pl index b0b3e24e5..572e06c51 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -1366,6 +1366,14 @@ sub singletest { if(!$replyattr{'nocheck'} && (@reply || $replyattr{'sendzero'})) { # verify the received data my @out = loadarray($CURLOUT); + my %hash = getpartattr("reply", "data"); + # get the mode attribute + my $filemode=$hash{'mode'}; + if(($filemode eq "text") && $has_textaware) { + # text mode when running on windows: fix line endings + map s/\r\n/\n/g, @out; + } + $res = compare("data", \@out, \@reply); if ($res) { return 1; |