From 75f00de55c6e8adc513f9ee32383b11e23106a40 Mon Sep 17 00:00:00 2001
From: Marc Hoersken <info@marc-hoersken.de>
Date: Sat, 1 Feb 2014 00:58:58 +0100
Subject: 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.
---
 tests/data/test584 | 66 +++++++++++++++++++++++++++---------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

(limited to 'tests/data/test584')

diff --git a/tests/data/test584 b/tests/data/test584
index 582a91120..309c7b65b 100644
--- 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
+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>
-- 
cgit v1.2.3