From efc112079c9d98dbe871dfcc7c00c8c46a1931f8 Mon Sep 17 00:00:00 2001
From: Marc Hoersken <info@marc-hoersken.de>
Date: Sat, 1 Feb 2014 13:49:58 +0100
Subject: [PATCH] test suite: stop conversion of valid output to CRLF on
 Windows

Since the output isn't actually being written in text-mode and it
was rather used as a workaround, disable text-mode for these tests.
---
 tests/data/test1080 | 2 +-
 tests/data/test1081 | 2 +-
 tests/data/test1099 | 2 +-
 tests/data/test1221 | 2 +-
 tests/data/test1330 | 2 +-
 tests/data/test1348 | 4 ++--
 tests/data/test1378 | 4 ++--
 tests/data/test1385 | 4 ++--
 tests/data/test96   | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tests/data/test1080 b/tests/data/test1080
index ae37fb7fd..e0f7d62ae 100644
--- a/tests/data/test1080
+++ b/tests/data/test1080
@@ -49,7 +49,7 @@ Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
 </protocol>
-<stdout mode="text">
+<stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose
 Location: data/10800002.txt?coolsite=yes
 Content-Length: 62
diff --git a/tests/data/test1081 b/tests/data/test1081
index d290020b6..d9f895fd2 100644
--- a/tests/data/test1081
+++ b/tests/data/test1081
@@ -57,7 +57,7 @@ Host: %HOSTIP:%HTTPPORT
 Accept: */*
 
 </protocol>
-<stdout mode="text">
+<stdout>
 HTTP/1.1 301 This is a weirdo text message swsclose
 Location: data/10810099.txt?coolsite=yes
 Content-Length: 62
diff --git a/tests/data/test1099 b/tests/data/test1099
index f81e6017b..cde403974 100644
--- a/tests/data/test1099
+++ b/tests/data/test1099
@@ -38,7 +38,7 @@ opcode: 1
 filename: /1099
 mode: octet
 </protocol>
-<stdout mode="text">
+<stdout>
 data for 1099
 </stdout>
 </verify>
diff --git a/tests/data/test1221 b/tests/data/test1221
index a0e3d74b7..a2a8b3fad 100644
--- a/tests/data/test1221
+++ b/tests/data/test1221
@@ -19,7 +19,7 @@ none
 <verify>
 <file1 name="log/stderr1221" mode="text">
 </file1>
-<file2 name="log/stdout1221" mode="text">
+<file2 name="log/stdout1221">
 Testing curl_10char_object_name...
 
 result: 16AFKPQRST expected: 16AFKPQRST input: 123__678__ABC__FGH__KLM__PQRSTUV
diff --git a/tests/data/test1330 b/tests/data/test1330
index 2aba0cecc..1fb5a6687 100644
--- a/tests/data/test1330
+++ b/tests/data/test1330
@@ -36,7 +36,7 @@ nothing
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/memdump" mode="text">
+<file name="log/memdump">
 MEM unit1330.c: malloc()
 MEM unit1330.c: free()
 </file>
diff --git a/tests/data/test1348 b/tests/data/test1348
index 77f2c0f5a..5f374cb2f 100644
--- a/tests/data/test1348
+++ b/tests/data/test1348
@@ -49,12 +49,12 @@ RETR file1348
 QUIT
 </protocol>
 
-<file1 name="log/file1348" mode="text">
+<file1 name="log/file1348">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1348" mode="text">
+<file2 name="log/stdout1348">
 </file2>
 
 </verify>
diff --git a/tests/data/test1378 b/tests/data/test1378
index 6b24f997c..e004afcaf 100644
--- a/tests/data/test1378
+++ b/tests/data/test1378
@@ -44,12 +44,12 @@ RETR file1378
 QUIT
 </protocol>
 
-<file1 name="log/download1378" mode="text">
+<file1 name="log/download1378">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1378" mode="text">
+<file2 name="log/stdout1378">
 </file2>
 
 </verify>
diff --git a/tests/data/test1385 b/tests/data/test1385
index cc392795c..ee35ab704 100644
--- a/tests/data/test1385
+++ b/tests/data/test1385
@@ -44,12 +44,12 @@ RETR file1385
 QUIT
 </protocol>
 
-<file1 name="log/download1385" mode="text">
+<file1 name="log/download1385">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout1385" mode="text">
+<file2 name="log/stdout1385">
 </file2>
 
 </verify>
diff --git a/tests/data/test96 b/tests/data/test96
index 865aff9c3..55a86cefc 100644
--- a/tests/data/test96
+++ b/tests/data/test96
@@ -30,7 +30,7 @@ curl memory tracking operational
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/memdump" mode="text">
+<file name="log/memdump">
 MEM tool_paramhlp.c
 MEM tool_cfgable.c
 </file>