From: Marcel Raad <Marcel.Raad@teamviewer.com>
Date: Tue, 15 Oct 2019 21:37:20 +0000 (+0200)
Subject: tests: line ending fixes for Windows
X-Git-Tag: curl-7_67_0~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=347075bc178003e4c51a46f355e4eb741b3a7964;p=thirdparty%2Fcurl.git

tests: line ending fixes for Windows

Mark some files as text.

Closes https://github.com/curl/curl/pull/4490
---

diff --git a/tests/data/test2005 b/tests/data/test2005
index 061f99b667..f78b4be56b 100644
--- a/tests/data/test2005
+++ b/tests/data/test2005
@@ -78,7 +78,7 @@ Data delivered from an HTTP resource
 </file1>
 <file2 name="log/stdout2005">
 </file2>
-<file3 name="log/stderr2005">
+<file3 name="log/stderr2005" mode="text">
 Metalink: parsing (file://%PWD/log/test2005.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2005.metalink) OK
 Metalink: fetching (log/download2005) from (http://%HOSTIP:%HTTPPORT/2005)...
diff --git a/tests/data/test2006 b/tests/data/test2006
index 4d08e0aad7..1f59717269 100644
--- a/tests/data/test2006
+++ b/tests/data/test2006
@@ -98,7 +98,7 @@ Funny-head: yesyes
 </file2>
 <file3 name="log/stdout2006">
 </file3>
-<file4 name="log/stderr2006">
+<file4 name="log/stderr2006" mode="text">
 Metalink: parsing (file://%PWD/log/test2006.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2006.metalink) OK
 Metalink: fetching (log/download2006) from (http://%HOSTIP:%HTTPPORT/2006)...
diff --git a/tests/data/test2007 b/tests/data/test2007
index bb4d5cde99..a8e5f1b45a 100644
--- a/tests/data/test2007
+++ b/tests/data/test2007
@@ -102,7 +102,7 @@ Funny-head: yesyes
 </file2>
 <file3 name="log/stdout2007">
 </file3>
-<file4 name="log/stderr2007">
+<file4 name="log/stderr2007" mode="text">
 Metalink: parsing (file://%PWD/log/test2007.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2007.metalink) OK
 Metalink: fetching (log/download2007) from (http://%HOSTIP:%HTTPPORT/2007)...
diff --git a/tests/data/test2008 b/tests/data/test2008
index d6bbf6b4b2..1a00332853 100644
--- a/tests/data/test2008
+++ b/tests/data/test2008
@@ -94,7 +94,7 @@ Funny-head: yesyes
 </file2>
 <file3 name="log/stdout2008">
 </file3>
-<file4 name="log/stderr2008">
+<file4 name="log/stderr2008" mode="text">
 Metalink: parsing (file://%PWD/log/test2008.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2008.metalink) OK
 Metalink: fetching (log/download2008) from (http://%HOSTIP:%HTTPPORT/2008)...
diff --git a/tests/data/test2009 b/tests/data/test2009
index 1a93358517..08308d03e2 100644
--- a/tests/data/test2009
+++ b/tests/data/test2009
@@ -95,7 +95,7 @@ Funny-head: yesyes
 </file2>
 <file3 name="log/stdout2009">
 </file3>
-<file4 name="log/stderr2009">
+<file4 name="log/stderr2009" mode="text">
 Metalink: parsing (file://%PWD/log/test2009.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2009.metalink) OK
 Metalink: fetching (log/download2009) from (http://%HOSTIP:%HTTPPORT/2009)...
diff --git a/tests/data/test2010 b/tests/data/test2010
index 1f5320fe9a..068c481b51 100644
--- a/tests/data/test2010
+++ b/tests/data/test2010
@@ -94,7 +94,7 @@ Funny-head: yesyes
 </file2>
 <file3 name="log/stdout2010">
 </file3>
-<file4 name="log/stderr2010">
+<file4 name="log/stderr2010" mode="text">
 Metalink: parsing (file://%PWD/log/test2010.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2010.metalink) OK
 Metalink: fetching (log/download2010) from (http://%HOSTIP:%HTTPPORT/2010)...
diff --git a/tests/data/test2011 b/tests/data/test2011
index 46785cf944..a84502317c 100644
--- a/tests/data/test2011
+++ b/tests/data/test2011
@@ -78,7 +78,7 @@ Data delivered from an HTTP resource
 </file1>
 <file2 name="log/stdout2011">
 </file2>
-<file3 name="log/stderr2011">
+<file3 name="log/stderr2011" mode="text">
 Metalink: parsing (file://%PWD/log/test2011.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2011.metalink) OK
 Metalink: fetching (log/download2011) from (http://%HOSTIP:%HTTPPORT/2011)...
diff --git a/tests/data/test2012 b/tests/data/test2012
index 59c042d127..6751269d59 100644
--- a/tests/data/test2012
+++ b/tests/data/test2012
@@ -77,7 +77,7 @@ Some contents delivered from an HTTP resource
 </file1>
 <file2 name="log/stdout2012">
 </file2>
-<file3 name="log/stderr2012">
+<file3 name="log/stderr2012" mode="text">
 Metalink: parsing (file://%PWD/log/test2012.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2012.metalink) WARNING (digest missing)
 Metalink: fetching (log/download2012) from (http://%HOSTIP:%HTTPPORT/2012)...
diff --git a/tests/data/test2013 b/tests/data/test2013
index 0985b32def..f4d0c2475c 100644
--- a/tests/data/test2013
+++ b/tests/data/test2013
@@ -66,7 +66,7 @@ perl %SRCDIR/libtest/notexists.pl log/2013 log/name2013 /tmp/download2013
 <verify>
 <file1 name="log/stdout2013">
 </file1>
-<file2 name="log/stderr2013">
+<file2 name="log/stderr2013" mode="text">
 Metalink: parsing (file://%PWD/log/test2013.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2013.metalink) WARNING (missing or invalid file name)
 Metalink: parsing (file://%PWD/log/test2013.metalink) FAILED
diff --git a/tests/data/test2014 b/tests/data/test2014
index d2dbdc7a79..65d2ec7660 100644
--- a/tests/data/test2014
+++ b/tests/data/test2014
@@ -66,7 +66,7 @@ perl %SRCDIR/libtest/notexists.pl log/2014 log/name2014 log/download2014
 <verify>
 <file1 name="log/stdout2014">
 </file1>
-<file2 name="log/stderr2014">
+<file2 name="log/stderr2014" mode="text">
 Metalink: parsing (file://%PWD/log/test2014.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2014.metalink) WARNING (missing or invalid file name)
 Metalink: parsing (file://%PWD/log/test2014.metalink) FAILED
diff --git a/tests/data/test2015 b/tests/data/test2015
index a35f3117d9..d356f88bca 100644
--- a/tests/data/test2015
+++ b/tests/data/test2015
@@ -66,7 +66,7 @@ perl %SRCDIR/libtest/notexists.pl log/2015 log/name2015 log/download2015
 <verify>
 <file1 name="log/stdout2015">
 </file1>
-<file2 name="log/stderr2015">
+<file2 name="log/stderr2015" mode="text">
 Metalink: parsing (file://%PWD/log/test2015.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2015.metalink) WARNING (missing or invalid file name)
 Metalink: parsing (file://%PWD/log/test2015.metalink) FAILED
diff --git a/tests/data/test2016 b/tests/data/test2016
index 572aa65c5c..ff2862d51d 100644
--- a/tests/data/test2016
+++ b/tests/data/test2016
@@ -66,7 +66,7 @@ perl %SRCDIR/libtest/notexists.pl log/2016 log/name2016 log/download2016
 <verify>
 <file1 name="log/stdout2016">
 </file1>
-<file2 name="log/stderr2016">
+<file2 name="log/stderr2016" mode="text">
 Metalink: parsing (file://%PWD/log/test2016.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2016.metalink) WARNING (missing or invalid file name)
 Metalink: parsing (file://%PWD/log/test2016.metalink) FAILED
diff --git a/tests/data/test2017 b/tests/data/test2017
index 15fd9347c8..11c71c3dbf 100644
--- a/tests/data/test2017
+++ b/tests/data/test2017
@@ -66,7 +66,7 @@ perl %SRCDIR/libtest/notexists.pl log/2017 log/name2017
 <verify>
 <file1 name="log/stdout2017">
 </file1>
-<file2 name="log/stderr2017">
+<file2 name="log/stderr2017" mode="text">
 Metalink: parsing (file://%PWD/log/test2017.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2017.metalink) WARNING (missing or invalid file name)
 Metalink: parsing (file://%PWD/log/test2017.metalink) FAILED
diff --git a/tests/data/test2018 b/tests/data/test2018
index 6d0652dcc6..9fb433d944 100644
--- a/tests/data/test2018
+++ b/tests/data/test2018
@@ -66,7 +66,7 @@ perl %SRCDIR/libtest/notexists.pl log/2018 log/name2018 log/.download2018
 <verify>
 <file1 name="log/stdout2018">
 </file1>
-<file2 name="log/stderr2018">
+<file2 name="log/stderr2018" mode="text">
 Metalink: parsing (file://%PWD/log/test2018.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2018.metalink) WARNING (missing or invalid file name)
 Metalink: parsing (file://%PWD/log/test2018.metalink) FAILED
diff --git a/tests/data/test2019 b/tests/data/test2019
index b17b3f23f9..abd8cad9a4 100644
--- a/tests/data/test2019
+++ b/tests/data/test2019
@@ -66,7 +66,7 @@ perl %SRCDIR/libtest/notexists.pl log/2019 log/name2019
 <verify>
 <file1 name="log/stdout2019">
 </file1>
-<file2 name="log/stderr2019">
+<file2 name="log/stderr2019" mode="text">
 Metalink: parsing (file://%PWD/log/test2019.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2019.metalink) WARNING (missing or invalid file name)
 Metalink: parsing (file://%PWD/log/test2019.metalink) FAILED
diff --git a/tests/data/test2020 b/tests/data/test2020
index 8bf85a4d7f..584f6df3b4 100644
--- a/tests/data/test2020
+++ b/tests/data/test2020
@@ -66,7 +66,7 @@ perl %SRCDIR/libtest/notexists.pl log/2020 log/name2020
 <verify>
 <file1 name="log/stdout2020">
 </file1>
-<file2 name="log/stderr2020">
+<file2 name="log/stderr2020" mode="text">
 Metalink: parsing (file://%PWD/log/test2020.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2020.metalink) WARNING (missing or invalid file name)
 Metalink: parsing (file://%PWD/log/test2020.metalink) FAILED
diff --git a/tests/data/test2021 b/tests/data/test2021
index 20a92244a2..b0921d48a0 100644
--- a/tests/data/test2021
+++ b/tests/data/test2021
@@ -66,7 +66,7 @@ perl %SRCDIR/libtest/notexists.pl log/2021 log/name2021 log/download2021
 <verify>
 <file1 name="log/stdout2021">
 </file1>
-<file2 name="log/stderr2021">
+<file2 name="log/stderr2021" mode="text">
 Metalink: parsing (file://%PWD/log/test2021.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2021.metalink) WARNING (missing or invalid file name)
 Metalink: parsing (file://%PWD/log/test2021.metalink) FAILED
diff --git a/tests/data/test2022 b/tests/data/test2022
index 4f4efd1766..e9044732a1 100644
--- a/tests/data/test2022
+++ b/tests/data/test2022
@@ -66,7 +66,7 @@ perl %SRCDIR/libtest/notexists.pl log/2022 log/name2022 log/download2022
 <verify>
 <file1 name="log/stdout2022">
 </file1>
-<file2 name="log/stderr2022">
+<file2 name="log/stderr2022" mode="text">
 Metalink: parsing (file://%PWD/log/test2022.metalink) metalink/XML...
 Metalink: parsing (file://%PWD/log/test2022.metalink) WARNING (missing or invalid file name)
 Metalink: parsing (file://%PWD/log/test2022.metalink) FAILED
diff --git a/tests/data/test356 b/tests/data/test356
index 1be05fe6f4..c1234b4506 100644
--- a/tests/data/test356
+++ b/tests/data/test356
@@ -61,7 +61,7 @@ Accept: */*
 # matches
 s/\"([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-356">
+<file name="log/altsvc-356" mode="text">
 # Your alt-svc cache. https://curl.haxx.se/docs/alt-svc.html
 # This file was generated by libcurl! Edit at your own risk.
 h1 %HOSTIP %HTTPPORT h1 nowhere.foo 81 TIMESTAMP 0 0