From: Dan Fandrich Date: Wed, 29 Mar 2023 01:20:54 +0000 (-0700) Subject: tests: use %LOGDIR to refer to the log directory X-Git-Tag: curl-8_1_0~249 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e7a021e1;p=thirdparty%2Fcurl.git tests: use %LOGDIR to refer to the log directory This will allow it be set dynamically. Ref: #10818 --- diff --git a/.github/scripts/spellcheck.words b/.github/scripts/spellcheck.words index 0447c8dbff..a9e2a7aaad 100644 --- a/.github/scripts/spellcheck.words +++ b/.github/scripts/spellcheck.words @@ -409,6 +409,7 @@ LineageOS linux ln localhost +LOGDIR logfile lookups loopback @@ -586,6 +587,7 @@ pthreads PTR ptr punycode +PWD py pycurl pytest diff --git a/tests/FILEFORMAT.md b/tests/FILEFORMAT.md index 1ecd407043..72ae5c18db 100644 --- a/tests/FILEFORMAT.md +++ b/tests/FILEFORMAT.md @@ -24,8 +24,8 @@ with a `testcase` tag, which encompasses the remainder of the file. When a test is to be executed, the source file is first preprocessed and variables are substituted by their respective contents and the output -version of the test file is stored as `log/testNUM`. That version is what will -be read and used by the test servers. +version of the test file is stored as `%LOGDIR/testNUM`. That version is what +will be read and used by the test servers. ## Base64 Encoding @@ -137,6 +137,7 @@ Available substitute variables include: - `%SOCKSUNIXPATH` - Absolute Path to the Unix socket of the SOCKS server - `%IMAP6PORT` - IPv6 port number of the IMAP server - `%IMAPPORT` - Port number of the IMAP server +- `%LOGDIR` - Log directory relative to %PWD - `%MQTTPORT` - Port number of the MQTT server - `%TELNETPORT` - Port number of the telnet server - `%NOLISTENPORT` - Port number where no service is listening @@ -554,7 +555,7 @@ parameter is the not negative integer number of seconds for the delay. This 'delay' attribute is intended for specific test cases, and normally not needed. -### `` +### `` This creates the named file with this content before the test case is run, which is useful if the test case needs a file to act on. @@ -620,7 +621,7 @@ before comparing with the one actually received by the client `crlf=yes` forces the newlines to become CRLF even if not written so in the test. -### `` +### `` The file's contents must be identical to this after the test is complete. Use the mode="text" attribute if the output is in text mode on platforms that have a text/binary difference. diff --git a/tests/data/test10 b/tests/data/test10 index 5dd9356cd4..b52850fa50 100644 --- a/tests/data/test10 +++ b/tests/data/test10 @@ -26,9 +26,9 @@ http simple HTTP PUT from file -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt - + Weird file to diff --git a/tests/data/test1001 b/tests/data/test1001 index 738afb27f9..8900a80a23 100644 --- a/tests/data/test1001 +++ b/tests/data/test1001 @@ -72,9 +72,9 @@ proxy HTTP POST --digest with PUT and resumed upload and modified method -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET - + test diff --git a/tests/data/test1002 b/tests/data/test1002 index d929ae724c..3a098f10d3 100644 --- a/tests/data/test1002 +++ b/tests/data/test1002 @@ -71,9 +71,9 @@ proxy HTTP PUT with Digest auth, resumed upload and modified method, twice -http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 -T log/%TESTNUMBER -u auser:apasswd --digest -x http://%HOSTIP:%HTTPPORT -C 2 -X GET +http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload2 -T %LOGDIR/%TESTNUMBER -u auser:apasswd --digest -x http://%HOSTIP:%HTTPPORT -C 2 -X GET - + test diff --git a/tests/data/test1007 b/tests/data/test1007 index c50e97d513..b6b6464287 100644 --- a/tests/data/test1007 +++ b/tests/data/test1007 @@ -17,9 +17,9 @@ tftp TFTP send with invalid permission on server --T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//invalid-file +-T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//invalid-file - + This data will not be sent diff --git a/tests/data/test1013 b/tests/data/test1013 index 17a3371f10..70c6455e30 100644 --- a/tests/data/test1013 +++ b/tests/data/test1013 @@ -23,7 +23,7 @@ Compare curl --version with curl-config --protocols --version -%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config log/stdout%TESTNUMBER protocols +%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER protocols diff --git a/tests/data/test1014 b/tests/data/test1014 index 875fa77620..8dc3f0421e 100644 --- a/tests/data/test1014 +++ b/tests/data/test1014 @@ -23,7 +23,7 @@ Compare curl --version with curl-config --features --version -%SRCDIR/libtest/test1013.pl ../curl-config log/stdout%TESTNUMBER features +%SRCDIR/libtest/test1013.pl ../curl-config %LOGDIR/stdout%TESTNUMBER features diff --git a/tests/data/test1015 b/tests/data/test1015 index 28412c2f79..c9971fcca5 100644 --- a/tests/data/test1015 +++ b/tests/data/test1015 @@ -28,9 +28,9 @@ http --data-urlencode -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --data-urlencode "my name is moo[]" --data-urlencode "y e s=s_i_r" --data-urlencode "v_alue@log/%TESTNUMBER.txt" --data-urlencode @log/%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --data-urlencode "my name is moo[]" --data-urlencode "y e s=s_i_r" --data-urlencode "v_alue@%LOGDIR/%TESTNUMBER.txt" --data-urlencode @%LOGDIR/%TESTNUMBER.txt - + content to _?!#$'|<> diff --git a/tests/data/test1016 b/tests/data/test1016 index 340dd969b4..91ac2da380 100644 --- a/tests/data/test1016 +++ b/tests/data/test1016 @@ -23,9 +23,9 @@ file X-Y range on a file:// URL to stdout --r 1-4 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt +-r 1-4 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + 1234567890 diff --git a/tests/data/test1017 b/tests/data/test1017 index 034c87a7f7..59614b12f8 100644 --- a/tests/data/test1017 +++ b/tests/data/test1017 @@ -24,9 +24,9 @@ file 0-Y range on a file:// URL to stdout --r 0-3 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt +-r 0-3 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + 1234567890 diff --git a/tests/data/test1018 b/tests/data/test1018 index 25d8cb1807..1fde0ca1a5 100644 --- a/tests/data/test1018 +++ b/tests/data/test1018 @@ -23,9 +23,9 @@ file X-X range on a file:// URL to stdout --r 4-4 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt +-r 4-4 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + 1234567890 diff --git a/tests/data/test1019 b/tests/data/test1019 index 02732b4836..87f88f5621 100644 --- a/tests/data/test1019 +++ b/tests/data/test1019 @@ -24,9 +24,9 @@ file X- range on a file:// URL to stdout --r 7- file://localhost%FILE_PWD/log/test%TESTNUMBER.txt +-r 7- file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + 1234567890 1234567890 diff --git a/tests/data/test1020 b/tests/data/test1020 index 91c9b63896..a17106e9d4 100644 --- a/tests/data/test1020 +++ b/tests/data/test1020 @@ -24,9 +24,9 @@ file -Y range on a file:// URL to stdout --r -9 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt +-r -9 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + 1234567890 1234567890 diff --git a/tests/data/test1022 b/tests/data/test1022 index e55b51ffe7..2288e9b99a 100644 --- a/tests/data/test1022 +++ b/tests/data/test1022 @@ -23,7 +23,7 @@ Compare curl --version with curl-config --version --version -%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config log/stdout%TESTNUMBER version +%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER version diff --git a/tests/data/test1023 b/tests/data/test1023 index 18071c6dae..27a144db55 100644 --- a/tests/data/test1023 +++ b/tests/data/test1023 @@ -23,7 +23,7 @@ Compare curl --version with curl-config --vernum --version -%SRCDIR/libtest/test1022.pl ../curl-config log/stdout%TESTNUMBER vernum +%SRCDIR/libtest/test1022.pl ../curl-config %LOGDIR/stdout%TESTNUMBER vernum diff --git a/tests/data/test1024 b/tests/data/test1024 index d8ceff10a3..fbd1db4223 100644 --- a/tests/data/test1024 +++ b/tests/data/test1024 @@ -75,7 +75,7 @@ http HTTP Location: following with cookies -http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c log/jar%TESTNUMBER +http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c %LOGDIR/jar%TESTNUMBER cookies diff --git a/tests/data/test1025 b/tests/data/test1025 index ef0b33fb0d..039824c1ae 100644 --- a/tests/data/test1025 +++ b/tests/data/test1025 @@ -75,7 +75,7 @@ http HTTP Location: following with command-line and server cookies -http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c log/jar%TESTNUMBER -b forcedcookie=yes +http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c %LOGDIR/jar%TESTNUMBER -b forcedcookie=yes cookies diff --git a/tests/data/test1026 b/tests/data/test1026 index a702a1d6d0..d240f91a9e 100644 --- a/tests/data/test1026 +++ b/tests/data/test1026 @@ -28,7 +28,7 @@ curl --manual # Search for these two sentinel lines in the manual output; if they are found, # then chances are good the entire manual is there. -perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(CONTRIBUTORS)/, ); exit ($lines != 2); # Let this file pass an XML syntax check: ' log/stdout%TESTNUMBER +perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(CONTRIBUTORS)/, ); exit ($lines != 2); # Let this file pass an XML syntax check: ' %LOGDIR/stdout%TESTNUMBER diff --git a/tests/data/test1027 b/tests/data/test1027 index 7574203e2b..6ce71b0cc7 100644 --- a/tests/data/test1027 +++ b/tests/data/test1027 @@ -25,7 +25,7 @@ curl --help # Search for these two sentinel lines in the help output; if they are found, # then chances are good the entire help is there. -perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, ); exit ($lines != 2); # Let this file pass an XML syntax check: ' log/stdout%TESTNUMBER +perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, ); exit ($lines != 2); # Let this file pass an XML syntax check: ' %LOGDIR/stdout%TESTNUMBER diff --git a/tests/data/test1030 b/tests/data/test1030 index 5824977023..c84033af3c 100644 --- a/tests/data/test1030 +++ b/tests/data/test1030 @@ -67,9 +67,9 @@ crypto HTTP PUT with --anyauth authorization (picking Digest) -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth - + This is data we upload with PUT a second line line three diff --git a/tests/data/test1036 b/tests/data/test1036 index 4ab61a2783..88183bc7df 100644 --- a/tests/data/test1036 +++ b/tests/data/test1036 @@ -33,7 +33,7 @@ FTP download resume from end of file ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C - - + This is the start!! @@ -52,7 +52,7 @@ REST 20 RETR %TESTNUMBER QUIT - + This is the start!! expected to be a file without the first part but we emulate that diff --git a/tests/data/test1037 b/tests/data/test1037 index d9cacb2339..6d3ede54ac 100644 --- a/tests/data/test1037 +++ b/tests/data/test1037 @@ -33,7 +33,7 @@ FTP download resume from end of empty file ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C - - + diff --git a/tests/data/test1038 b/tests/data/test1038 index acac84a29b..46fe821fa9 100644 --- a/tests/data/test1038 +++ b/tests/data/test1038 @@ -23,9 +23,9 @@ ftp FTP PASV upload resume from end of file -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C - +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C - - + this is the *****cr@p******** that we're gonna upload worx? diff --git a/tests/data/test1039 b/tests/data/test1039 index 53d7cb5cb4..9f6d51306b 100644 --- a/tests/data/test1039 +++ b/tests/data/test1039 @@ -23,9 +23,9 @@ ftp FTP PASV upload resume from end of empty file -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C - +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C - - + this is the *****cr@p******** that we're gonna upload worx? diff --git a/tests/data/test1040 b/tests/data/test1040 index 8899c5b061..21410c6e97 100644 --- a/tests/data/test1040 +++ b/tests/data/test1040 @@ -49,7 +49,7 @@ HTTP GET with resume from end of entirely-downloaded file http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - - + 012345678 012345678 012345678 diff --git a/tests/data/test1041 b/tests/data/test1041 index 6c3c01cbcf..4e23e2cb6c 100644 --- a/tests/data/test1041 +++ b/tests/data/test1041 @@ -31,7 +31,7 @@ http HTTP PUT with resume from end of already-uploaded file - + 012345678 012345678 012345678 @@ -44,7 +44,7 @@ HTTP PUT with resume from end of already-uploaded file 012345678 -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Tlog/test%TESTNUMBER.txt -C - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T%LOGDIR/test%TESTNUMBER.txt -C - diff --git a/tests/data/test1042 b/tests/data/test1042 index 4a33ae826d..f05c873639 100644 --- a/tests/data/test1042 +++ b/tests/data/test1042 @@ -61,7 +61,7 @@ HTTP GET beyond end of entirely-downloaded file, no server resume http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 200 - + 012345678 012345678 012345678 diff --git a/tests/data/test1043 b/tests/data/test1043 index c728b96888..310256f65b 100644 --- a/tests/data/test1043 +++ b/tests/data/test1043 @@ -60,7 +60,7 @@ HTTP GET with resume from end of file http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - - + 012345678 012345678 012345678 diff --git a/tests/data/test1051 b/tests/data/test1051 index 9c082067b0..fab1dbf957 100644 --- a/tests/data/test1051 +++ b/tests/data/test1051 @@ -56,9 +56,9 @@ http HTTP PUT with Location: following -http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -T log/test%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -T %LOGDIR/test%TESTNUMBER.txt - + Weird file to diff --git a/tests/data/test1052 b/tests/data/test1052 index 8f8ee61bc3..0ae56d033a 100644 --- a/tests/data/test1052 +++ b/tests/data/test1052 @@ -52,9 +52,9 @@ http HTTP 1.0 PUT with Location: following -http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -0 -L -T log/test%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -0 -L -T %LOGDIR/test%TESTNUMBER.txt - + Weird file to diff --git a/tests/data/test1053 b/tests/data/test1053 index 06abcf1fb6..6211e0df43 100644 --- a/tests/data/test1053 +++ b/tests/data/test1053 @@ -61,10 +61,10 @@ http HTTP RFC1867-type formposting from file with Location: following -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -L -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -L -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt # We create this file before the command is invoked! - + foo- This is a moo- bar diff --git a/tests/data/test1054 b/tests/data/test1054 index d8b1d452c0..d972579b90 100644 --- a/tests/data/test1054 +++ b/tests/data/test1054 @@ -47,11 +47,11 @@ http HTTP POST from file with 301 redirect and --post301 - + field=data -http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @log/test%TESTNUMBER.txt --post301 +http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @%LOGDIR/test%TESTNUMBER.txt --post301 diff --git a/tests/data/test1055 b/tests/data/test1055 index b27b35b81d..937068028d 100644 --- a/tests/data/test1055 +++ b/tests/data/test1055 @@ -36,9 +36,9 @@ ftp HTTP PUT Location: redirect to FTP URL -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -T log/test%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -T %LOGDIR/test%TESTNUMBER.txt - + Weird file to diff --git a/tests/data/test1063 b/tests/data/test1063 index ca1ba14a8d..ae9922a70f 100644 --- a/tests/data/test1063 +++ b/tests/data/test1063 @@ -28,9 +28,9 @@ Invalid large X- range on a file:// # This range value is 2**32+7, which will be truncated to the valid value 7 # if the large file support is not working correctly --r 4294967303- file://localhost%FILE_PWD/log/test%TESTNUMBER.txt +-r 4294967303- file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + 1234567890 1234567890 diff --git a/tests/data/test1064 b/tests/data/test1064 index 1f5b4526ff..298486616b 100644 --- a/tests/data/test1064 +++ b/tests/data/test1064 @@ -35,9 +35,9 @@ http HTTP PUT twice --H "Expect:" -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.upload2 +-H "Expect:" -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.upload2 - + test diff --git a/tests/data/test1065 b/tests/data/test1065 index 02e9a85650..bd4be888f6 100644 --- a/tests/data/test1065 +++ b/tests/data/test1065 @@ -36,9 +36,9 @@ http HTTP PUT with one file but two URLs --H "Expect:" -T log/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.url2 +-H "Expect:" -T %LOGDIR/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER.upload1 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002.url2 - + test diff --git a/tests/data/test107 b/tests/data/test107 index 911de45bdd..5feffac412 100644 --- a/tests/data/test107 +++ b/tests/data/test107 @@ -15,7 +15,7 @@ ftp FTP PASV upload file - + data to see @@ -24,7 +24,7 @@ works so does it? -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test1070 b/tests/data/test1070 index 3e4d37a52e..ce88a1f048 100644 --- a/tests/data/test1070 +++ b/tests/data/test1070 @@ -32,9 +32,9 @@ http HTTP POST with server closing connection before (all) data is received - -d @log/input%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Expect: 100-continue" + -d @%LOGDIR/input%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Expect: 100-continue" - + This creates the named file with this content before the test case is run, which is useful if the test case needs a file to act on. We create this file rather large (larger than your typical TCP packet) so that not all of it can nor diff --git a/tests/data/test1071 b/tests/data/test1071 index 9eee479705..568471eafa 100644 --- a/tests/data/test1071 +++ b/tests/data/test1071 @@ -73,9 +73,9 @@ crypto Downgraded HTTP PUT to HTTP 1.0 with authorization -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth - + This is data we upload with PUT a second line line three diff --git a/tests/data/test1075 b/tests/data/test1075 index d55468138f..2dac5bf986 100644 --- a/tests/data/test1075 +++ b/tests/data/test1075 @@ -52,9 +52,9 @@ http HTTP PUT with --anyauth authorization (picking Basic) -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth - + This is data we upload with PUT a second line line three diff --git a/tests/data/test108 b/tests/data/test108 index 6f6e3c83c6..7efc748d41 100644 --- a/tests/data/test108 +++ b/tests/data/test108 @@ -21,9 +21,9 @@ ftp FTP PORT upload with CWD -ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/%TESTNUMBER -T log/upload%TESTNUMBER -P - +ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -P - - + Moooooooooooo upload this diff --git a/tests/data/test109 b/tests/data/test109 index 739e90b1cd..baab37b30f 100644 --- a/tests/data/test109 +++ b/tests/data/test109 @@ -21,9 +21,9 @@ ftp FTP PASV upload append -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER --append +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER --append - + Moooooooooooo upload this diff --git a/tests/data/test1104 b/tests/data/test1104 index 0d89bde8ee..2401be9558 100644 --- a/tests/data/test1104 +++ b/tests/data/test1104 @@ -59,7 +59,7 @@ http HTTP cookie expiry date at Jan 1 00:00:00 GMT 1970 -http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x %HOSTIP:%HTTPPORT -c log/cookies%TESTNUMBER.jar +http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -x %HOSTIP:%HTTPPORT -c %LOGDIR/cookies%TESTNUMBER.jar cookies diff --git a/tests/data/test1105 b/tests/data/test1105 index 73a33a3c53..6434ab2e40 100644 --- a/tests/data/test1105 +++ b/tests/data/test1105 @@ -35,7 +35,7 @@ http HTTP with cookie parser and header recording -"http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER" -c log/cookie%TESTNUMBER.txt -d "userid=myname&password=mypassword" +"http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?parm1=this*that/other/thing&parm2=foobar/%TESTNUMBER" -c %LOGDIR/cookie%TESTNUMBER.txt -d "userid=myname&password=mypassword" perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );" @@ -57,7 +57,7 @@ Content-Type: application/x-www-form-urlencoded userid=myname&password=mypassword - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test1116 b/tests/data/test1116 index 16588422fc..b106c074dd 100644 --- a/tests/data/test1116 +++ b/tests/data/test1116 @@ -57,7 +57,7 @@ http HTTP GET with chunked trailer without Trailer: -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER @@ -71,7 +71,7 @@ User-Agent: curl/%VERSION Accept: */* - + HTTP/1.1 200 funky chunky! Server: fakeit/0.9 fakeitbad/1.0 Transfer-Encoding: chunked diff --git a/tests/data/test112 b/tests/data/test112 index 6d23c44573..c48506c366 100644 --- a/tests/data/test112 +++ b/tests/data/test112 @@ -20,9 +20,9 @@ ftp FTP PASV upload resume -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C 40 +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 40 - + this is the *****crap******** that we're gonna upload worx? diff --git a/tests/data/test1129 b/tests/data/test1129 index df4a9b0f9a..2591be6d35 100644 --- a/tests/data/test1129 +++ b/tests/data/test1129 @@ -41,7 +41,7 @@ skip: 1053700 # Client-side # 1053700 x 'x' - + %repeat[1053700 x x]% @@ -51,7 +51,7 @@ http HTTP POST expect 100-continue with a 404 --d @log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 +-d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 diff --git a/tests/data/test1130 b/tests/data/test1130 index 50ebeddc89..1b43432653 100644 --- a/tests/data/test1130 +++ b/tests/data/test1130 @@ -41,7 +41,7 @@ skip: 100 # Client-side # 100 x 'x' - + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX @@ -51,7 +51,7 @@ http HTTP POST forced expect 100-continue with a 404 --d @log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -H "Expect: 100-continue" +-d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 -H "Expect: 100-continue" diff --git a/tests/data/test1131 b/tests/data/test1131 index 685e80e894..13140dab47 100644 --- a/tests/data/test1131 +++ b/tests/data/test1131 @@ -41,7 +41,7 @@ skip: 100 # Client-side # 100 x 'x' - + XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX @@ -51,7 +51,7 @@ http HTTP PUT expect 100-continue with a 400 --H "Expect: 100-continue" -T log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 +-H "Expect: 100-continue" -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 diff --git a/tests/data/test1133 b/tests/data/test1133 index ae6c323acb..f79ece91a2 100644 --- a/tests/data/test1133 +++ b/tests/data/test1133 @@ -29,10 +29,10 @@ http HTTP RFC1867-type formposting with filename/data contains ',', ';', '"' -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "file=@\"log/test%TESTNUMBER,and;.txt\";type=mo/foo;filename=\"faker,and;.txt\"" -F 'file2=@"log/test%TESTNUMBER,and;.txt"' -F 'file3=@"log/test%TESTNUMBER,and;.txt";type=m/f,"log/test%TESTNUMBER,and;.txt"' -F a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b=" \\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b' +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "file=@\"%LOGDIR/test%TESTNUMBER,and;.txt\";type=mo/foo;filename=\"faker,and;.txt\"" -F 'file2=@"%LOGDIR/test%TESTNUMBER,and;.txt"' -F 'file3=@"%LOGDIR/test%TESTNUMBER,and;.txt";type=m/f,"%LOGDIR/test%TESTNUMBER,and;.txt"' -F a="{\"field1\":\"value1\",\"field2\":\"value2\"}" -F 'b=" \\value1;type=\"whatever\" "; type=text/foo; charset=utf-8 ; filename=param_b' # We create this file before the command is invoked! - + foo bar This is a bar foo bar diff --git a/tests/data/test1136 b/tests/data/test1136 index 1ce5336227..a82079248c 100644 --- a/tests/data/test1136 +++ b/tests/data/test1136 @@ -45,14 +45,14 @@ Check cookies against PSL TZ=GMT -http://www.example.ck/%TESTNUMBER http://www.ck/%TESTNUMBER http://z-1.compute-1.amazonaws.com/%TESTNUMBER -b none -c log/jar%TESTNUMBER.txt -x %HOSTIP:%HTTPPORT +http://www.example.ck/%TESTNUMBER http://www.ck/%TESTNUMBER http://z-1.compute-1.amazonaws.com/%TESTNUMBER -b none -c %LOGDIR/jar%TESTNUMBER.txt -x %HOSTIP:%HTTPPORT # Verify data after the test has been "shot" - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test1145 b/tests/data/test1145 index ce855524f0..570197ee97 100644 --- a/tests/data/test1145 +++ b/tests/data/test1145 @@ -19,9 +19,9 @@ file:// bad host # This command should not succeed since we only accept # file:/// file://localhost/ file://127.0.0.1/ -file://bad-host%PWD/log/test%TESTNUMBER.txt +file://bad-host%PWD/%LOGDIR/test%TESTNUMBER.txt - + foo bar bar diff --git a/tests/data/test1146 b/tests/data/test1146 index 0278ab8954..55245bc523 100644 --- a/tests/data/test1146 +++ b/tests/data/test1146 @@ -25,9 +25,9 @@ file --proto-default file ---proto-default file %PWD/log/test%TESTNUMBER.txt +--proto-default file %PWD/%LOGDIR/test%TESTNUMBER.txt - + foo bar bar diff --git a/tests/data/test1147 b/tests/data/test1147 index 78cf49ad4d..81c33a8c88 100644 --- a/tests/data/test1147 +++ b/tests/data/test1147 @@ -35,7 +35,7 @@ http Get -H headers from a file - + One: 1 Two: 2 no-colon @@ -46,7 +46,7 @@ no-colon User-Agent: -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @log/heads%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt diff --git a/tests/data/test1148 b/tests/data/test1148 index 658cfcab84..dbd25921a6 100644 --- a/tests/data/test1148 +++ b/tests/data/test1148 @@ -35,7 +35,7 @@ http progress-bar -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -# --stderr log/stderrlog%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -# --stderr %LOGDIR/stderrlog%TESTNUMBER LC_ALL= @@ -56,7 +56,7 @@ Accept: */* # Check that the progress finished at 100% and has the right bar width. # Note the dot in 100.0% is regex to match any character since different # locales use different separators. - + correct diff --git a/tests/data/test1151 b/tests/data/test1151 index 52e912ef90..bb24d1b133 100644 --- a/tests/data/test1151 +++ b/tests/data/test1151 @@ -39,7 +39,7 @@ http HTTP with too long cookies -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt cookies @@ -55,7 +55,7 @@ User-Agent: curl/%VERSION Accept: */* - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test1155 b/tests/data/test1155 index 011d310f57..dbaf344e9f 100644 --- a/tests/data/test1155 +++ b/tests/data/test1155 @@ -28,7 +28,7 @@ http HTTP cookie with parameter word as name -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt cookies @@ -44,7 +44,7 @@ User-Agent: curl/%VERSION Accept: */* - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test1157 b/tests/data/test1157 index 8c0bcc3466..53f1b9963e 100644 --- a/tests/data/test1157 +++ b/tests/data/test1157 @@ -35,10 +35,10 @@ http Get -H headers from empty file - + -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @log/heads%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt diff --git a/tests/data/test1158 b/tests/data/test1158 index 3352ba0583..fa6f7b41b2 100644 --- a/tests/data/test1158 +++ b/tests/data/test1158 @@ -29,13 +29,13 @@ http HTTP RFC1867-type formposting with filename containing '"' -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "file=@\"log/test%TESTNUMBER\\\".txt\";type=mo/foo;filename=\"test%TESTNUMBER\\\".txt\"" -F 'file2=@"log/test%TESTNUMBER\".txt"' -F 'file3=@"log/test%TESTNUMBER\".txt";type=m/f,"log/test%TESTNUMBER\".txt"' +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "file=@\"%LOGDIR/test%TESTNUMBER\\\".txt\";type=mo/foo;filename=\"test%TESTNUMBER\\\".txt\"" -F 'file2=@"%LOGDIR/test%TESTNUMBER\".txt"' -F 'file3=@"%LOGDIR/test%TESTNUMBER\".txt";type=m/f,"%LOGDIR/test%TESTNUMBER\".txt"' perl -e "print 'Test requires a system supporting double quotes in file names' if ($^O eq 'msys');" # We create this file before the command is invoked! - + foo bar This is a bar foo bar diff --git a/tests/data/test1160 b/tests/data/test1160 index 7e31aa5dce..e6835987e7 100644 --- a/tests/data/test1160 +++ b/tests/data/test1160 @@ -29,7 +29,7 @@ http HTTP with long funny format cookie -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt cookies @@ -45,7 +45,7 @@ User-Agent: curl/%VERSION Accept: */* - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test1161 b/tests/data/test1161 index 88ed491da1..3b1a2fd191 100644 --- a/tests/data/test1161 +++ b/tests/data/test1161 @@ -28,7 +28,7 @@ http HTTP cookie with path set twice -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt cookies @@ -44,7 +44,7 @@ User-Agent: curl/%VERSION Accept: */* - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test1169 b/tests/data/test1169 index e7f7df4665..512baf54d6 100644 --- a/tests/data/test1169 +++ b/tests/data/test1169 @@ -16,12 +16,12 @@ Verify that runtests.pl accepts an -L option -%SRCDIR/runtests.pl -L %SRCDIR/log/test1196-library.pl +%SRCDIR/runtests.pl -L %SRCDIR/%LOGDIR/test1196-library.pl # Create a simple perl snippet that lets runtests.pl # exit with a code we can check. -echo 'exit 123' > %SRCDIR/log/test1196-library.pl +echo 'exit 123' > %SRCDIR/%LOGDIR/test1196-library.pl diff --git a/tests/data/test1176 b/tests/data/test1176 index d2471e1683..9ad1150f19 100644 --- a/tests/data/test1176 +++ b/tests/data/test1176 @@ -34,7 +34,7 @@ http --output using #0 -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o 'log/base-#0' +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o '%LOGDIR/base-#0' @@ -48,7 +48,7 @@ User-Agent: curl/%VERSION Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1182 b/tests/data/test1182 index 105d3d1f4a..5178926019 100644 --- a/tests/data/test1182 +++ b/tests/data/test1182 @@ -16,13 +16,13 @@ Verify that runtests.pl accepts an exclude file with the -E option -%SRCDIR/runtests.pl -o TESTDIR=%SRCDIR/log/data -o LOGDIR=%SRCDIR/log/log -E %SRCDIR/log/test%TESTNUMBER-exclude-file 1 +%SRCDIR/runtests.pl -o TESTDIR=%SRCDIR/%LOGDIR/data -o LOGDIR=%SRCDIR/%LOGDIR/log -E %SRCDIR/%LOGDIR/test%TESTNUMBER-exclude-file 1 -mkdir %SRCDIR/log/data ; mkdir %SRCDIR/log/log; cp %SRCDIR/data/test1 %SRCDIR/log/data; echo 'test:1:Test should not run for unit test %TESTNUMBER' > %SRCDIR/log/test%TESTNUMBER-exclude-file +mkdir %SRCDIR/%LOGDIR/data ; mkdir %SRCDIR/%LOGDIR/log; cp %SRCDIR/data/test1 %SRCDIR/%LOGDIR/data; echo 'test:1:Test should not run for unit test %TESTNUMBER' > %SRCDIR/%LOGDIR/test%TESTNUMBER-exclude-file -grep -q "Test should not run for unit test %TESTNUMBER" %SRCDIR/log/stdout%TESTNUMBER +grep -q "Test should not run for unit test %TESTNUMBER" %SRCDIR/%LOGDIR/stdout%TESTNUMBER diff --git a/tests/data/test1185 b/tests/data/test1185 index eb672efa4e..94c3be10c6 100644 --- a/tests/data/test1185 +++ b/tests/data/test1185 @@ -16,9 +16,9 @@ checksrc -%SRCDIR/../scripts/checksrc.pl log/code%TESTNUMBER.c +%SRCDIR/../scripts/checksrc.pl %LOGDIR/code%TESTNUMBER.c - + /* test source code * Violate each rule at least once. **/ @@ -86,93 +86,93 @@ void startfunc(int a, int b) { # Verify data after the test has been "shot" -./log/code1185.c:4:82: warning: Longer than 79 columns (LONGLINE) +./%LOGDIR/code1185.c:4:82: warning: Longer than 79 columns (LONGLINE) int hello; /*------------------------------------------------------------------*/ -./log/code1185.c:5:4: error: Contains TAB character (TABS) +./%LOGDIR/code1185.c:5:4: error: Contains TAB character (TABS) int tab; ^ -./log/code1185.c:7:13: warning: func with space (SPACEBEFOREPAREN) +./%LOGDIR/code1185.c:7:13: warning: func with space (SPACEBEFOREPAREN) int a = func (); ^ -./log/code1185.c:8:14: warning: space after open parenthesis (SPACEAFTERPAREN) +./%LOGDIR/code1185.c:8:14: warning: space after open parenthesis (SPACEAFTERPAREN) int b = func( b); ^ -./log/code1185.c:9:16: warning: space before close parenthesis (SPACEBEFORECLOSE) +./%LOGDIR/code1185.c:9:16: warning: space before close parenthesis (SPACEBEFORECLOSE) int b = func(b ); ^ -./log/code1185.c:10:11: warning: space before comma (SPACEBEFORECOMMA) +./%LOGDIR/code1185.c:10:11: warning: space before comma (SPACEBEFORECOMMA) func(a, b , c); ^ -./log/code1185.c:14:9: warning: return without space before paren (RETURNNOSPACE) +./%LOGDIR/code1185.c:14:9: warning: return without space before paren (RETURNNOSPACE) return(2); ^ -./log/code1185.c:16:11: warning: comma without following space (COMMANOSPACE) +./%LOGDIR/code1185.c:16:11: warning: comma without following space (COMMANOSPACE) func(a, b,c); ^ -./log/code1185.c:18:12: warning: wrongly placed open brace (BRACEPOS) +./%LOGDIR/code1185.c:18:12: warning: wrongly placed open brace (BRACEPOS) if(a == 2) { ^ -./log/code1185.c:20:1: warning: else after closing brace on same line (BRACEELSE) +./%LOGDIR/code1185.c:20:1: warning: else after closing brace on same line (BRACEELSE) } else { ^ -./log/code1185.c:24:11: warning: missing space after close paren (PARENBRACE) +./%LOGDIR/code1185.c:24:11: warning: missing space after close paren (PARENBRACE) if(a == 2){ ^ -./log/code1185.c:28:7: warning: no space before semicolon (SPACESEMICOLON) +./%LOGDIR/code1185.c:28:7: warning: no space before semicolon (SPACESEMICOLON) func() ; ^ -./log/code1185.c:30:5: warning: use of sprintf is banned (BANNEDFUNC) +./%LOGDIR/code1185.c:30:5: warning: use of sprintf is banned (BANNEDFUNC) a = sprintf(buffer, "%s", moo); ^ -./log/code1185.c:32:11: warning: use of non-binary fopen without FOPEN_* macro: r (FOPENMODE) +./%LOGDIR/code1185.c:32:11: warning: use of non-binary fopen without FOPEN_* macro: r (FOPENMODE) FILE *f = fopen("filename", "r"); ^ -./log/code1185.c:34:30: warning: wrongly placed open brace (BRACEPOS) +./%LOGDIR/code1185.c:34:30: warning: wrongly placed open brace (BRACEPOS) void startfunc(int a, int b) { ^ -./log/code1185.c:39:6: warning: not indented 2 steps (uses 4) (INDENTATION) +./%LOGDIR/code1185.c:39:6: warning: not indented 2 steps (uses 4) (INDENTATION) func(1); ^ -./log/code1185.c:42:8: warning: space after declarative asterisk (ASTERISKSPACE) +./%LOGDIR/code1185.c:42:8: warning: space after declarative asterisk (ASTERISKSPACE) char * name = "hello"; ^ -./log/code1185.c:43:7: warning: space after declarative asterisk (ASTERISKSPACE) +./%LOGDIR/code1185.c:43:7: warning: space after declarative asterisk (ASTERISKSPACE) char* name = "hello"; ^ -./log/code1185.c:43:6: warning: no space before asterisk (ASTERISKNOSPACE) +./%LOGDIR/code1185.c:43:6: warning: no space before asterisk (ASTERISKNOSPACE) char* name = "hello"; ^ -./log/code1185.c:45:10: warning: no space after equals sign (EQUALSNOSPACE) +./%LOGDIR/code1185.c:45:10: warning: no space after equals sign (EQUALSNOSPACE) int foo=bar; ^ -./log/code1185.c:46:9: warning: no space before equals sign (NOSPACEEQUALS) +./%LOGDIR/code1185.c:46:9: warning: no space before equals sign (NOSPACEEQUALS) int foo= bar; ^ -./log/code1185.c:48:16: warning: no space after semicolon (SEMINOSPACE) +./%LOGDIR/code1185.c:48:16: warning: no space after semicolon (SEMINOSPACE) int foo = bar;foo++; ^ -./log/code1185.c:49:10: warning: multiple spaces (MULTISPACE) +./%LOGDIR/code1185.c:49:10: warning: multiple spaces (MULTISPACE) for(;;) { ^ -./log/code1185.c:50:2: warning: not indented 2 steps (uses 0) (INDENTATION) +./%LOGDIR/code1185.c:50:2: warning: not indented 2 steps (uses 0) (INDENTATION) } ^ -./log/code1185.c:52:16: warning: sizeof without parenthesis (SIZEOFNOPAREN) +./%LOGDIR/code1185.c:52:16: warning: sizeof without parenthesis (SIZEOFNOPAREN) int a = sizeof int; ^ -./log/code1185.c:53:10: warning: use of snprintf is banned (SNPRINTF) +./%LOGDIR/code1185.c:53:10: warning: use of snprintf is banned (SNPRINTF) int a = snprintf(buffer, sizeof(buffer), "%d", 99); ^ -./log/code1185.c:55:7: warning: conditional block on the same line (ONELINECONDITION) +./%LOGDIR/code1185.c:55:7: warning: conditional block on the same line (ONELINECONDITION) if(a) b++; ^ -./log/code1185.c:57:2: warning: // comment (CPPCOMMENTS) +./%LOGDIR/code1185.c:57:2: warning: // comment (CPPCOMMENTS) // CPP comment? ^ -./log/code1185.c:1:1: error: Missing copyright statement (COPYRIGHT) +./%LOGDIR/code1185.c:1:1: error: Missing copyright statement (COPYRIGHT) ^ -./log/code1185.c:1:1: error: Missing closing comment (OPENCOMMENT) +./%LOGDIR/code1185.c:1:1: error: Missing closing comment (OPENCOMMENT) ^ checksrc: 0 errors and 30 warnings diff --git a/tests/data/test1186 b/tests/data/test1186 index 8b3834cdab..12faf09345 100644 --- a/tests/data/test1186 +++ b/tests/data/test1186 @@ -29,13 +29,13 @@ http Multipart formposting with backslash-escaping filename containing '"' -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --form-escape -F "file=@\"log/test%TESTNUMBER\\\".txt\";type=mo/foo;filename=\"test%TESTNUMBER\\\".txt\"" -F 'file2=@"log/test%TESTNUMBER\".txt"' -F 'file3=@"log/test%TESTNUMBER\".txt";type=m/f,"log/test%TESTNUMBER\".txt"' +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --form-escape -F "file=@\"%LOGDIR/test%TESTNUMBER\\\".txt\";type=mo/foo;filename=\"test%TESTNUMBER\\\".txt\"" -F 'file2=@"%LOGDIR/test%TESTNUMBER\".txt"' -F 'file3=@"%LOGDIR/test%TESTNUMBER\".txt";type=m/f,"%LOGDIR/test%TESTNUMBER\".txt"' perl -e "print 'Test requires a system supporting double quotes in file names' if ($^O eq 'msys');" # We create this file before the command is invoked! - + foo bar This is a bar foo bar diff --git a/tests/data/test1189 b/tests/data/test1189 index c7f21d6f8f..cacac5d754 100644 --- a/tests/data/test1189 +++ b/tests/data/test1189 @@ -29,10 +29,10 @@ http Multipart formposting with backslash-escaping of name= and filename= -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --form-escape -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2= # We create this file before the command is invoked! - + foo bar This is a bar foo bar diff --git a/tests/data/test1193 b/tests/data/test1193 index bed10b2419..531efa2597 100644 --- a/tests/data/test1193 +++ b/tests/data/test1193 @@ -26,9 +26,9 @@ mqtt MQTT PUBLISH 2k payload -mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d @log/payload%TESTNUMBER +mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d @%LOGDIR/payload%TESTNUMBER - + 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 diff --git a/tests/data/test1210 b/tests/data/test1210 index 89cfe61eaf..4a07147f92 100644 --- a/tests/data/test1210 +++ b/tests/data/test1210 @@ -36,7 +36,7 @@ http HTTP GET with -J without Content-Disposition -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER?junk -J -O @@ -53,7 +53,7 @@ User-Agent: curl/%VERSION Accept: */* - + 12345 diff --git a/tests/data/test1216 b/tests/data/test1216 index 0b1bad606d..b812f8d9bc 100644 --- a/tests/data/test1216 +++ b/tests/data/test1216 @@ -31,9 +31,9 @@ http HTTP cookie domains tailmatching the host name -http://example.fake/c/%TESTNUMBER http://bexample.fake/c/%TESTNUMBER -b log/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT +http://example.fake/c/%TESTNUMBER http://bexample.fake/c/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT - + example.fake FALSE /a FALSE 2139150993 mooo indeed example.fake FALSE /b FALSE 0 moo1 indeed example.fake FALSE /c FALSE 2139150993 moo2 indeed diff --git a/tests/data/test1220 b/tests/data/test1220 index 49cbf2c491..d7e2ff9424 100644 --- a/tests/data/test1220 +++ b/tests/data/test1220 @@ -21,9 +21,9 @@ file file:// URLs with query string -file://localhost%FILE_PWD/log/test%TESTNUMBER.txt?a_query=foobar#afragment +file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt?a_query=foobar#afragment - + contents in a single file diff --git a/tests/data/test1221 b/tests/data/test1221 index 9382312b83..42617e85b0 100644 --- a/tests/data/test1221 +++ b/tests/data/test1221 @@ -29,9 +29,9 @@ http --url-query with --data-urlencode -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --url-query "my name is moo[]" --url-query "yes=s i r" --url-query "v_alue@log/%TESTNUMBER.txt" --url-query @log/%TESTNUMBER.txt --url-query "+%3d%3d" --data-urlencode "start=once upon the time" +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --url-query "my name is moo[]" --url-query "yes=s i r" --url-query "v_alue@%LOGDIR/%TESTNUMBER.txt" --url-query @%LOGDIR/%TESTNUMBER.txt --url-query "+%3d%3d" --data-urlencode "start=once upon the time" - + content to _?!#$'|<> diff --git a/tests/data/test123 b/tests/data/test123 index 1604f0b0c7..21d3b58ae1 100644 --- a/tests/data/test123 +++ b/tests/data/test123 @@ -19,9 +19,9 @@ ftp FTP upload resume with whole file already downloaded -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C 51 +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 51 - + -------------------------------------------------- diff --git a/tests/data/test1243 b/tests/data/test1243 index ba08a837f8..7f71631917 100644 --- a/tests/data/test1243 +++ b/tests/data/test1243 @@ -16,9 +16,9 @@ tftp TFTP send without TFTP options requests --T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// --tftp-no-options +-T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// --tftp-no-options - + a chunk of data sent diff --git a/tests/data/test1268 b/tests/data/test1268 index 562f376a33..257b4726ed 100644 --- a/tests/data/test1268 +++ b/tests/data/test1268 @@ -23,12 +23,12 @@ unix-sockets file name argument looks like a flag ---stderr log/moo%TESTNUMBER --unix-socket -k hej://moo +--stderr %LOGDIR/moo%TESTNUMBER --unix-socket -k hej://moo - + Warning: The file name argument '-k' looks like a flag. curl: (1) Protocol "hej" not supported or disabled in libcurl diff --git a/tests/data/test1271 b/tests/data/test1271 index 184fd87f13..2d412a6bf7 100644 --- a/tests/data/test1271 +++ b/tests/data/test1271 @@ -27,9 +27,9 @@ http --write-out from file with empty file -http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w @log/blank%TESTNUMBER +http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w @%LOGDIR/blank%TESTNUMBER - + diff --git a/tests/data/test1273 b/tests/data/test1273 index 0c076cb961..d724fdd843 100644 --- a/tests/data/test1273 +++ b/tests/data/test1273 @@ -53,7 +53,7 @@ http http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - -f - + 012345678 012345678 012345678 diff --git a/tests/data/test1274 b/tests/data/test1274 index f640a69f61..5198537876 100644 --- a/tests/data/test1274 +++ b/tests/data/test1274 @@ -36,7 +36,7 @@ http HTTP header line folding -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/out%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/out%TESTNUMBER @@ -50,7 +50,7 @@ User-Agent: curl/%VERSION Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT %if hyper diff --git a/tests/data/test1278 b/tests/data/test1278 index ba30569088..9516446374 100644 --- a/tests/data/test1278 +++ b/tests/data/test1278 @@ -34,7 +34,7 @@ http verify extra --no-remote-name -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-progress-meter -o log/out%TESTNUMBER --no-remote-name -w '%{stderr}yes\n' +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --no-progress-meter -o %LOGDIR/out%TESTNUMBER --no-remote-name -w '%{stderr}yes\n' diff --git a/tests/data/test128 b/tests/data/test128 index c9429c5fe0..e3ed4157bd 100644 --- a/tests/data/test128 +++ b/tests/data/test128 @@ -20,9 +20,9 @@ ftp FTP upload with --crlf -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER --crlf +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER --crlf - + file with unix newlines meant to be diff --git a/tests/data/test1283 b/tests/data/test1283 index df0458cc54..1e8e9d4474 100644 --- a/tests/data/test1283 +++ b/tests/data/test1283 @@ -30,7 +30,7 @@ http globbing range with same start and stop -http://%HOSTIP:%HTTPPORT/[a-a][1-1][b-b:1][2-2:1]/%TESTNUMBER -o "log/outfile%TESTNUMBER_#1#2#3#4.dump" +http://%HOSTIP:%HTTPPORT/[a-a][1-1][b-b:1][2-2:1]/%TESTNUMBER -o "%LOGDIR/outfile%TESTNUMBER_#1#2#3#4.dump" @@ -43,7 +43,7 @@ User-Agent: curl/%VERSION Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Content-Length: 6 diff --git a/tests/data/test1285 b/tests/data/test1285 index 0a907b60ec..986cb92cc7 100644 --- a/tests/data/test1285 +++ b/tests/data/test1285 @@ -60,9 +60,9 @@ HTTP PUT --digest with user-specified Content-Length header # even when there is a user-specified Content-Length header. # https://github.com/curl/curl/pull/1242 --H "Content-Length: 85" -u auser:apasswd --digest -T log/put%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER +-H "Content-Length: 85" -u auser:apasswd --digest -T %LOGDIR/put%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER - + This is data we upload with PUT a second line line three diff --git a/tests/data/test1287 b/tests/data/test1287 index 0d0ad47d06..c4815314bf 100644 --- a/tests/data/test1287 +++ b/tests/data/test1287 @@ -82,7 +82,7 @@ User-Agent: curl/%VERSION Accept: */* - + %if !hyper * Ignoring Content-Length in CONNECT 200 response * Ignoring Transfer-Encoding in CONNECT 200 response diff --git a/tests/data/test1291 b/tests/data/test1291 index 5997dcc3ba..ea9a0c6ab4 100644 --- a/tests/data/test1291 +++ b/tests/data/test1291 @@ -24,14 +24,14 @@ none Attempt to upload 1000 files but fail immediately --K log/cmd%TESTNUMBER --fail-early +-K %LOGDIR/cmd%TESTNUMBER --fail-early - + XXXXXXXx # generate the config file -perl -e 'for(1 .. 1000) { printf("upload-file=log/upload-this\nurl=htttttp://non-existing-host.haxx.se/upload/%TESTNUMBER\n", $_);}' > log/cmd%TESTNUMBER; +perl -e 'for(1 .. 1000) { printf("upload-file=%LOGDIR/upload-this\nurl=htttttp://non-existing-host.haxx.se/upload/%TESTNUMBER\n", $_);}' > %LOGDIR/cmd%TESTNUMBER; diff --git a/tests/data/test130 b/tests/data/test130 index 31447cbbe3..665d0590f0 100644 --- a/tests/data/test130 +++ b/tests/data/test130 @@ -37,9 +37,9 @@ ftp FTP (optional .netrc; no user/pass) dir list PASV ---netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/ - + # the following two lines were created while testing curl # machine %HOSTIP login user1 password commented machine %HOSTIP login user1 password passwd1 diff --git a/tests/data/test1304 b/tests/data/test1304 index 699a2e43f5..438e5886c7 100644 --- a/tests/data/test1304 +++ b/tests/data/test1304 @@ -18,7 +18,7 @@ unittest netrc parsing unit tests - + machine example.com login admin password passwd machine curl.example.com login none password none diff --git a/tests/data/test1308 b/tests/data/test1308 index 3e827365c2..9bd5c056d4 100644 --- a/tests/data/test1308 +++ b/tests/data/test1308 @@ -21,7 +21,7 @@ Mime formpost unit tests - + Piece of the file that is to uploaded as a formpost diff --git a/tests/data/test131 b/tests/data/test131 index 63bd021945..52bff92d4b 100644 --- a/tests/data/test131 +++ b/tests/data/test131 @@ -38,9 +38,9 @@ ftp FTP (optional .netrc; user/no pass) dir list PASV ---netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://user2@%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://user2@%HOSTIP:%FTPPORT/ - + # the following two lines were created while testing curl machine %HOSTIP login user1 password passwd1 machine %HOSTIP login user2 password passwd2 diff --git a/tests/data/test1311 b/tests/data/test1311 index 6d5496f0c4..8e48794a08 100644 --- a/tests/data/test1311 +++ b/tests/data/test1311 @@ -37,7 +37,7 @@ http HTTP GET with -J and Content-Disposition -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O @@ -54,7 +54,7 @@ User-Agent: curl/%VERSION Accept: */* - + 12345 diff --git a/tests/data/test1312 b/tests/data/test1312 index 2d48914580..c8170a8afa 100644 --- a/tests/data/test1312 +++ b/tests/data/test1312 @@ -37,7 +37,7 @@ http HTTP GET with -J, Content-Disposition and ; in filename -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR %HOSTIP:%HTTPPORT/%TESTNUMBER -J -O @@ -54,7 +54,7 @@ User-Agent: curl/%VERSION Accept: */* - + 12345 diff --git a/tests/data/test1313 b/tests/data/test1313 index b1ac1fcea1..8a28597440 100644 --- a/tests/data/test1313 +++ b/tests/data/test1313 @@ -37,7 +37,7 @@ http HTTP GET with -J, Content-Disposition, uneven quotes -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O @@ -54,7 +54,7 @@ User-Agent: curl/%VERSION Accept: */* - + 12345 diff --git a/tests/data/test1315 b/tests/data/test1315 index dd66df71ac..e1de8f68ce 100644 --- a/tests/data/test1315 +++ b/tests/data/test1315 @@ -32,10 +32,10 @@ http HTTP RFC1867-type formposting - -F with three files, one with explicit type -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@log/test%TESTNUMBER.txt,log/test%TESTNUMBER.txt;type=magic/content,log/test%TESTNUMBER.txt' +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@%LOGDIR/test%TESTNUMBER.txt,%LOGDIR/test%TESTNUMBER.txt;type=magic/content,%LOGDIR/test%TESTNUMBER.txt' # We create this file before the command is invoked! - + dummy data diff --git a/tests/data/test132 b/tests/data/test132 index d33980fa7d..b02d993999 100644 --- a/tests/data/test132 +++ b/tests/data/test132 @@ -37,9 +37,9 @@ ftp FTP (optional .netrc; user/passwd supplied) dir list PASV ---netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/ - + # the following two lines were created while testing curl machine %HOSTIP login user1 password passwd1 machine %HOSTIP login user2 password passwd2 diff --git a/tests/data/test1327 b/tests/data/test1327 index 791189b90a..5941e5005e 100644 --- a/tests/data/test1327 +++ b/tests/data/test1327 @@ -27,12 +27,12 @@ TELNET check of upload with stdout redirected GET /ignore/for/%TESTNUMBER HTTP/1.0 - + GET /we/want/%TESTNUMBER HTTP/1.0 -telnet://%HOSTIP:%HTTPPORT -T log/%TESTNUMBER.txt +telnet://%HOSTIP:%HTTPPORT -T %LOGDIR/%TESTNUMBER.txt diff --git a/tests/data/test1328 b/tests/data/test1328 index b7b3e3247b..a85c6b6eef 100644 --- a/tests/data/test1328 +++ b/tests/data/test1328 @@ -47,7 +47,7 @@ http HTTP GET a globbed range with -f --f 'http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0000-%TESTNUMBER0001]' -o log/#1 +-f 'http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0000-%TESTNUMBER0001]' -o %LOGDIR/#1 diff --git a/tests/data/test133 b/tests/data/test133 index ad0d2def77..8b914cb713 100644 --- a/tests/data/test133 +++ b/tests/data/test133 @@ -37,9 +37,9 @@ ftp FTP compulsory .netrc; ignore passwd in URL --n --netrc-file log/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/ +-n --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/ - + # the following two lines were created while testing curl machine %HOSTIP login user1 password passwd1 machine %HOSTIP login mary password drfrank diff --git a/tests/data/test1330 b/tests/data/test1330 index 2cc5aedd76..0dd8f7d267 100644 --- a/tests/data/test1330 +++ b/tests/data/test1330 @@ -31,7 +31,7 @@ nothing # # Verify data after the test has been "shot" - + MEM unit%TESTNUMBER.c: malloc() MEM unit%TESTNUMBER.c: free() diff --git a/tests/data/test1331 b/tests/data/test1331 index 7683d6272e..a233c63c4e 100644 --- a/tests/data/test1331 +++ b/tests/data/test1331 @@ -62,7 +62,7 @@ http HTTP --proxy-anyauth and 407 with cookies --U myname:mypassword -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER --proxy-anyauth -c log/dump%TESTNUMBER +-U myname:mypassword -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER --proxy-anyauth -c %LOGDIR/dump%TESTNUMBER cookies diff --git a/tests/data/test1334 b/tests/data/test1334 index b19155923c..88a41d8b2b 100644 --- a/tests/data/test1334 +++ b/tests/data/test1334 @@ -35,10 +35,10 @@ http HTTP GET with -O without Content-Disposition, -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER @@ -53,11 +53,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -67,7 +67,7 @@ Content-Type: text/html - + diff --git a/tests/data/test1335 b/tests/data/test1335 index e3507603bb..4d64ea877f 100644 --- a/tests/data/test1335 +++ b/tests/data/test1335 @@ -35,7 +35,7 @@ http HTTP GET with -O without Content-Disposition, -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - @@ -53,11 +53,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1336 b/tests/data/test1336 index 631f204e84..993d8c6f87 100644 --- a/tests/data/test1336 +++ b/tests/data/test1336 @@ -36,13 +36,13 @@ http HTTP GET with -O and Content-Disposition, -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -57,11 +57,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange - + diff --git a/tests/data/test1337 b/tests/data/test1337 index 808c8a2a4b..4b954d063a 100644 --- a/tests/data/test1337 +++ b/tests/data/test1337 @@ -36,13 +36,13 @@ http HTTP GET with -O and Content-Disposition, -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D - -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -57,11 +57,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1338 b/tests/data/test1338 index 672e9aea89..c1c271a95e 100644 --- a/tests/data/test1338 +++ b/tests/data/test1338 @@ -36,10 +36,10 @@ http HTTP GET with -O -J without Content-Disposition, -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER @@ -54,11 +54,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -68,7 +68,7 @@ Content-Type: text/html - + diff --git a/tests/data/test1339 b/tests/data/test1339 index 4bc77e9762..a46934d3a3 100644 --- a/tests/data/test1339 +++ b/tests/data/test1339 @@ -36,7 +36,7 @@ http HTTP GET with -O -J without Content-Disposition, -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - @@ -54,11 +54,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test134 b/tests/data/test134 index 00d1732df4..d0716c3d12 100644 --- a/tests/data/test134 +++ b/tests/data/test134 @@ -39,9 +39,9 @@ FTP (optional .netrc; programmatic user/passwd) dir list PASV # -u overrides netrc which overrides the URL ---netrc-optional --netrc-file log/netrc%TESTNUMBER -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER -u romulus:rhemus ftp://mary:mark@%HOSTIP:%FTPPORT/ - + # the following two lines were created while testing curl machine %HOSTIP login user1 password passwd1 machine %HOSTIP login user2 password passwd2 diff --git a/tests/data/test1340 b/tests/data/test1340 index e48907bb42..ebec701a64 100644 --- a/tests/data/test1340 +++ b/tests/data/test1340 @@ -37,10 +37,10 @@ http HTTP GET with -O -J and Content-Disposition, -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%PWD/%LOGDIR -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D log/heads%TESTNUMBER -w "curl saved to filename %{filename_effective}\n" +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER -w "curl saved to filename %{filename_effective}\n" @@ -55,11 +55,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -70,8 +70,8 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange - -curl saved to filename %PWD/log/name%TESTNUMBER + +curl saved to filename %PWD/%LOGDIR/name%TESTNUMBER diff --git a/tests/data/test1341 b/tests/data/test1341 index cf13a1fecd..75d9daae74 100644 --- a/tests/data/test1341 +++ b/tests/data/test1341 @@ -37,7 +37,7 @@ http HTTP GET with -O -J and Content-Disposition, -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%PWD/%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - -w "curl saved to filename %{filename_effective}\n" @@ -55,11 +55,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -68,7 +68,7 @@ Connection: close Content-Type: text/html Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange -curl saved to filename %PWD/log/name%TESTNUMBER +curl saved to filename %PWD/%LOGDIR/name%TESTNUMBER diff --git a/tests/data/test1342 b/tests/data/test1342 index 6bab2831e4..39dbfab57d 100644 --- a/tests/data/test1342 +++ b/tests/data/test1342 @@ -35,10 +35,10 @@ http HTTP GET with -O -i without Content-Disposition, -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER @@ -53,7 +53,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -64,7 +64,7 @@ Content-Type: text/html 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -74,7 +74,7 @@ Content-Type: text/html - + diff --git a/tests/data/test1343 b/tests/data/test1343 index 3f0d63059d..6a9eb7dc81 100644 --- a/tests/data/test1343 +++ b/tests/data/test1343 @@ -35,7 +35,7 @@ http HTTP GET with -O -i without Content-Disposition, -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - @@ -53,7 +53,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -64,7 +64,7 @@ Content-Type: text/html 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1344 b/tests/data/test1344 index bb33616791..ba4b38976d 100644 --- a/tests/data/test1344 +++ b/tests/data/test1344 @@ -36,13 +36,13 @@ http HTTP GET with -O -i and Content-Disposition, -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -57,7 +57,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -69,7 +69,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -80,7 +80,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange - + diff --git a/tests/data/test1345 b/tests/data/test1345 index bd9470c149..a9298e4e27 100644 --- a/tests/data/test1345 +++ b/tests/data/test1345 @@ -36,13 +36,13 @@ http HTTP GET with -O -i and Content-Disposition, -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D - -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -57,7 +57,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -69,7 +69,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1346 b/tests/data/test1346 index 32d434d03f..bab67cb631 100644 --- a/tests/data/test1346 +++ b/tests/data/test1346 @@ -35,7 +35,7 @@ http HTTP GET with -O -i without Content-Disposition, without -D -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O @@ -53,7 +53,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -64,7 +64,7 @@ Content-Type: text/html 12345 - + diff --git a/tests/data/test1347 b/tests/data/test1347 index 46e1ae608d..868e2611c8 100644 --- a/tests/data/test1347 +++ b/tests/data/test1347 @@ -36,13 +36,13 @@ http HTTP GET with -O -i and Content-Disposition, without -D -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -57,7 +57,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -69,7 +69,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange 12345 - + diff --git a/tests/data/test1348 b/tests/data/test1348 index df7a620c3a..3de0b4a93b 100644 --- a/tests/data/test1348 +++ b/tests/data/test1348 @@ -28,7 +28,7 @@ ftp FTP download, file without Content-Disposition inside, using -O -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O @@ -49,12 +49,12 @@ RETR file%TESTNUMBER QUIT - + fooo mooo - + diff --git a/tests/data/test1349 b/tests/data/test1349 index 10ba0bddc7..d2565496cb 100644 --- a/tests/data/test1349 +++ b/tests/data/test1349 @@ -28,10 +28,10 @@ ftp FTP download, file without C-D inside, using -O -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER @@ -49,14 +49,14 @@ RETR file%TESTNUMBER QUIT - + fooo mooo # The final "221 bye bye baby" response to QUIT will not be recorded # since that is not considered part of this particular transfer! - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -76,7 +76,7 @@ mooo s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1350 b/tests/data/test1350 index e9ea522bad..b5568f536b 100644 --- a/tests/data/test1350 +++ b/tests/data/test1350 @@ -28,7 +28,7 @@ ftp FTP download, file without C-D inside, using -O -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - @@ -49,14 +49,14 @@ RETR file%TESTNUMBER QUIT - + fooo mooo # The final "221 bye bye baby" response to QUIT will not be recorded # since that is not considered part of this particular transfer! - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1351 b/tests/data/test1351 index 4c8ed4caad..93232d55cd 100644 --- a/tests/data/test1351 +++ b/tests/data/test1351 @@ -29,10 +29,10 @@ ftp FTP download, file without C-D inside, using -O -J -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER @@ -50,14 +50,14 @@ RETR file%TESTNUMBER QUIT - + fooo mooo # The final "221 bye bye baby" response to QUIT will not be recorded # since that is not considered part of this particular transfer! - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -77,7 +77,7 @@ mooo s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1352 b/tests/data/test1352 index 3af12a8015..0649289b64 100644 --- a/tests/data/test1352 +++ b/tests/data/test1352 @@ -29,7 +29,7 @@ ftp FTP download, file without C-D inside, using -O -J -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - @@ -50,14 +50,14 @@ RETR file%TESTNUMBER QUIT - + fooo mooo # The final "221 bye bye baby" response to QUIT will not be recorded # since that is not considered part of this particular transfer! - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1353 b/tests/data/test1353 index 34049706df..8e0ad50e4f 100644 --- a/tests/data/test1353 +++ b/tests/data/test1353 @@ -28,10 +28,10 @@ ftp FTP download, file without C-D inside, using -O -i -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER @@ -49,14 +49,14 @@ RETR file%TESTNUMBER QUIT - + fooo mooo # The final "221 bye bye baby" response to QUIT will not be recorded # since that is not considered part of this particular transfer! - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -76,7 +76,7 @@ mooo s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1354 b/tests/data/test1354 index e5d15635a4..506ec90e45 100644 --- a/tests/data/test1354 +++ b/tests/data/test1354 @@ -28,7 +28,7 @@ ftp FTP download, file without C-D inside, using -O -i -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - @@ -49,12 +49,12 @@ RETR file%TESTNUMBER QUIT - + fooo mooo - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1355 b/tests/data/test1355 index f008803e67..fa19fabc4a 100644 --- a/tests/data/test1355 +++ b/tests/data/test1355 @@ -28,7 +28,7 @@ ftp FTP download, file without C-D inside, using -O -i, without -D -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i @@ -49,12 +49,12 @@ RETR file%TESTNUMBER QUIT - + fooo mooo - + diff --git a/tests/data/test1356 b/tests/data/test1356 index 7be22473a3..0c326f48c7 100644 --- a/tests/data/test1356 +++ b/tests/data/test1356 @@ -36,13 +36,13 @@ ftp FTP download, file with Content-Disposition inside, using -O -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -60,7 +60,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + diff --git a/tests/data/test1357 b/tests/data/test1357 index ebb102c95c..9d395a8750 100644 --- a/tests/data/test1357 +++ b/tests/data/test1357 @@ -36,13 +36,13 @@ ftp FTP download, file with C-D inside, using -O -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -60,7 +60,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -92,7 +92,7 @@ MOOOO s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1358 b/tests/data/test1358 index 983e1cdc0b..973ef7cf4c 100644 --- a/tests/data/test1358 +++ b/tests/data/test1358 @@ -36,13 +36,13 @@ ftp FTP download, file with C-D inside, using -O -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D - -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -60,7 +60,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1359 b/tests/data/test1359 index c4fb2eec43..fc1eb37289 100644 --- a/tests/data/test1359 +++ b/tests/data/test1359 @@ -37,13 +37,13 @@ ftp FTP download, file with C-D inside, using -O -J -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -61,7 +61,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -73,7 +73,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -93,7 +93,7 @@ MOOOO s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1360 b/tests/data/test1360 index 3f7b43535b..1fb80eecdb 100644 --- a/tests/data/test1360 +++ b/tests/data/test1360 @@ -37,13 +37,13 @@ ftp FTP download, file with C-D inside, using -O -J -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D - -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -61,7 +61,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -73,7 +73,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1361 b/tests/data/test1361 index 3f1f378936..6b9af1ad8a 100644 --- a/tests/data/test1361 +++ b/tests/data/test1361 @@ -36,13 +36,13 @@ ftp FTP download, file with C-D inside, using -O -i -D file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -60,7 +60,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -92,7 +92,7 @@ MOOOO s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1362 b/tests/data/test1362 index c5a09cbe8a..03d99047b7 100644 --- a/tests/data/test1362 +++ b/tests/data/test1362 @@ -36,13 +36,13 @@ ftp FTP download, file with C-D inside, using -O -i -D stdout -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D - -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -60,7 +60,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1363 b/tests/data/test1363 index e48074b46f..009f68cae2 100644 --- a/tests/data/test1363 +++ b/tests/data/test1363 @@ -36,13 +36,13 @@ ftp FTP download, file with C-D inside, using -O -i, without -D -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER @@ -60,7 +60,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + diff --git a/tests/data/test1364 b/tests/data/test1364 index ac2c423d29..0ea1e2b12e 100644 --- a/tests/data/test1364 +++ b/tests/data/test1364 @@ -30,10 +30,10 @@ http HTTP GET -o fname without Content-Disposition, -D file -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER @@ -48,11 +48,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -62,7 +62,7 @@ Content-Type: text/html - + diff --git a/tests/data/test1365 b/tests/data/test1365 index cee54b3a7d..abd371c010 100644 --- a/tests/data/test1365 +++ b/tests/data/test1365 @@ -30,10 +30,10 @@ http HTTP GET -o fname without Content-Disposition, -D stdout -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D - -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER @@ -48,11 +48,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1366 b/tests/data/test1366 index ae634cf65d..78f5573ea4 100644 --- a/tests/data/test1366 +++ b/tests/data/test1366 @@ -31,10 +31,10 @@ http HTTP GET -o fname and Content-Disposition, -D file -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -49,11 +49,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange - + diff --git a/tests/data/test1367 b/tests/data/test1367 index a74a4c423a..24929365a0 100644 --- a/tests/data/test1367 +++ b/tests/data/test1367 @@ -31,10 +31,10 @@ http HTTP GET -o fname and Content-Disposition, -D stdout -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D - -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -49,11 +49,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1368 b/tests/data/test1368 index 629a635d9a..1d6d181b08 100644 --- a/tests/data/test1368 +++ b/tests/data/test1368 @@ -31,10 +31,10 @@ http HTTP GET -o fname -J without Content-Disposition, -D file -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER @@ -49,11 +49,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -63,7 +63,7 @@ Content-Type: text/html - + diff --git a/tests/data/test1369 b/tests/data/test1369 index 08665d12df..48fd31806f 100644 --- a/tests/data/test1369 +++ b/tests/data/test1369 @@ -31,10 +31,10 @@ http HTTP GET -o fname -J without Content-Disposition, -D stdout -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D - -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER @@ -49,11 +49,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1370 b/tests/data/test1370 index 96e7e74578..d769401435 100644 --- a/tests/data/test1370 +++ b/tests/data/test1370 @@ -32,10 +32,10 @@ http HTTP GET -o fname -J and Content-Disposition, -D file -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -50,11 +50,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -65,7 +65,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange - + diff --git a/tests/data/test1371 b/tests/data/test1371 index aa5c69a752..8565363b93 100644 --- a/tests/data/test1371 +++ b/tests/data/test1371 @@ -32,10 +32,10 @@ http HTTP GET -o fname -J and Content-Disposition, -D stdout -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D - -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -50,11 +50,11 @@ Accept: */* - + 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1372 b/tests/data/test1372 index 29c478cdf6..76b367132e 100644 --- a/tests/data/test1372 +++ b/tests/data/test1372 @@ -30,10 +30,10 @@ http HTTP GET -o fname -i without Content-Disposition, -D file -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER @@ -48,7 +48,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -59,7 +59,7 @@ Content-Type: text/html 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -69,7 +69,7 @@ Content-Type: text/html - + diff --git a/tests/data/test1373 b/tests/data/test1373 index b4c737d68d..c475deb9f0 100644 --- a/tests/data/test1373 +++ b/tests/data/test1373 @@ -30,10 +30,10 @@ http HTTP GET -o fname -i without Content-Disposition, -D stdout -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D - -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER @@ -48,7 +48,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -59,7 +59,7 @@ Content-Type: text/html 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1374 b/tests/data/test1374 index 07bd3bb5a6..aa2b3e346e 100644 --- a/tests/data/test1374 +++ b/tests/data/test1374 @@ -31,10 +31,10 @@ http HTTP GET -o fname -i and Content-Disposition, -D file -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -49,7 +49,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -61,7 +61,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange - + diff --git a/tests/data/test1375 b/tests/data/test1375 index 2acdb54a15..6df5526360 100644 --- a/tests/data/test1375 +++ b/tests/data/test1375 @@ -31,10 +31,10 @@ http HTTP GET -o fname -i and Content-Disposition, -D stdout -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D - +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D - -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -49,7 +49,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -61,7 +61,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange 12345 - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test1376 b/tests/data/test1376 index f81f35fe3d..f3d36e0af3 100644 --- a/tests/data/test1376 +++ b/tests/data/test1376 @@ -30,10 +30,10 @@ http HTTP GET -o fname -i without Content-Disposition, without -D -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER @@ -48,7 +48,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -59,7 +59,7 @@ Content-Type: text/html 12345 - + diff --git a/tests/data/test1377 b/tests/data/test1377 index 745f08f489..d1a6b72134 100644 --- a/tests/data/test1377 +++ b/tests/data/test1377 @@ -31,10 +31,10 @@ http HTTP GET -o fname -i and Content-Disposition, without -D -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -49,7 +49,7 @@ Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -61,7 +61,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange 12345 - + diff --git a/tests/data/test1378 b/tests/data/test1378 index d04e740bf8..7348a3f175 100644 --- a/tests/data/test1378 +++ b/tests/data/test1378 @@ -23,10 +23,10 @@ ftp FTP DL, file without Content-Disposition inside, using -o fname -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER @@ -44,12 +44,12 @@ RETR file%TESTNUMBER QUIT - + fooo mooo - + diff --git a/tests/data/test1379 b/tests/data/test1379 index e611ac6b81..0b8d20ae0c 100644 --- a/tests/data/test1379 +++ b/tests/data/test1379 @@ -23,10 +23,10 @@ ftp FTP DL, file without C-D inside, using -o fname -D file -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER @@ -44,12 +44,12 @@ RETR file%TESTNUMBER QUIT - + fooo mooo - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -69,7 +69,7 @@ mooo s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1380 b/tests/data/test1380 index 3cc52613ba..187dd8cdbb 100644 --- a/tests/data/test1380 +++ b/tests/data/test1380 @@ -23,10 +23,10 @@ ftp FTP DL, file without C-D inside, using -o fname -D stdout -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D - -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER @@ -44,12 +44,12 @@ RETR file%TESTNUMBER QUIT - + fooo mooo - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1381 b/tests/data/test1381 index a62ee47484..4ba20eb3e6 100644 --- a/tests/data/test1381 +++ b/tests/data/test1381 @@ -24,10 +24,10 @@ ftp FTP DL, file without C-D inside, using -o fname -J -D file -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER @@ -45,12 +45,12 @@ RETR file%TESTNUMBER QUIT - + fooo mooo - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -70,7 +70,7 @@ mooo s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1382 b/tests/data/test1382 index 8c49877b1a..26ff7acbe8 100644 --- a/tests/data/test1382 +++ b/tests/data/test1382 @@ -24,10 +24,10 @@ ftp FTP DL, file without C-D inside, using -o fname -J -D stdout -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D - -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER @@ -45,12 +45,12 @@ RETR file%TESTNUMBER QUIT - + fooo mooo - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1383 b/tests/data/test1383 index 34f3cf6bc5..d4c5c8285a 100644 --- a/tests/data/test1383 +++ b/tests/data/test1383 @@ -23,10 +23,10 @@ ftp FTP DL, file without C-D inside, using -o fname -i -D file -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER @@ -44,12 +44,12 @@ RETR file%TESTNUMBER QUIT - + fooo mooo - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -69,7 +69,7 @@ mooo s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1384 b/tests/data/test1384 index f27d59a754..af7afdf766 100644 --- a/tests/data/test1384 +++ b/tests/data/test1384 @@ -23,10 +23,10 @@ ftp FTP DL, file without C-D inside, using -o fname -i -D stdout -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D - -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER @@ -44,12 +44,12 @@ RETR file%TESTNUMBER QUIT - + fooo mooo - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1385 b/tests/data/test1385 index e35c674b3a..d2038ee920 100644 --- a/tests/data/test1385 +++ b/tests/data/test1385 @@ -23,10 +23,10 @@ ftp FTP DL, file without C-D inside, using -o fname -i, without -D -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER @@ -44,12 +44,12 @@ RETR file%TESTNUMBER QUIT - + fooo mooo - + diff --git a/tests/data/test1386 b/tests/data/test1386 index 471493b44f..0aaf664194 100644 --- a/tests/data/test1386 +++ b/tests/data/test1386 @@ -31,10 +31,10 @@ ftp FTP DL, file with Content-Disposition inside, using -o fname -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -52,7 +52,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + diff --git a/tests/data/test1387 b/tests/data/test1387 index c8f5ae6d7b..0f124d870c 100644 --- a/tests/data/test1387 +++ b/tests/data/test1387 @@ -31,10 +31,10 @@ ftp FTP DL, file with C-D inside, using -o fname -D file -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -52,7 +52,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -84,7 +84,7 @@ MOOOO s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1388 b/tests/data/test1388 index 479ca42f02..d78844e77e 100644 --- a/tests/data/test1388 +++ b/tests/data/test1388 @@ -31,10 +31,10 @@ ftp FTP DL, file with C-D inside, using -o fname -D stdout -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D - -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -52,7 +52,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1389 b/tests/data/test1389 index eb35d39f5c..0863a40139 100644 --- a/tests/data/test1389 +++ b/tests/data/test1389 @@ -32,10 +32,10 @@ ftp FTP DL, file with C-D inside, using -o fname -J -D file -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -53,7 +53,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -65,7 +65,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -85,7 +85,7 @@ MOOOO s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1390 b/tests/data/test1390 index fc30849d33..a856d1e8d6 100644 --- a/tests/data/test1390 +++ b/tests/data/test1390 @@ -32,10 +32,10 @@ ftp FTP DL, file with C-D inside, using -o fname -J -D stdout -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D - -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -53,7 +53,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -65,7 +65,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1391 b/tests/data/test1391 index ce28e5aa74..ae1495eec9 100644 --- a/tests/data/test1391 +++ b/tests/data/test1391 @@ -31,10 +31,10 @@ ftp FTP DL, file with C-D inside, using -o fname -i -D file -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D log/heads%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D %LOGDIR/heads%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -52,7 +52,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | @@ -84,7 +84,7 @@ MOOOO s/^(229 Entering Passive Mode $).*($.*)/${1}stripped${2}/ - + diff --git a/tests/data/test1392 b/tests/data/test1392 index 99e13c3493..f715fe8b3c 100644 --- a/tests/data/test1392 +++ b/tests/data/test1392 @@ -31,10 +31,10 @@ ftp FTP DL, file with C-D inside, using -o fname -i -D stdout -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D - +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D - -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -52,7 +52,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + 220- _ _ ____ _ 220- ___| | | | _ \| | 220- / __| | | | |_) | | diff --git a/tests/data/test1393 b/tests/data/test1393 index 1402eaf4cd..dc7a6f9341 100644 --- a/tests/data/test1393 +++ b/tests/data/test1393 @@ -31,10 +31,10 @@ ftp FTP DL, file with C-D inside, using -o fname -i, without -D -ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i +ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER @@ -52,7 +52,7 @@ RETR file%TESTNUMBER QUIT - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake @@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange MOOOO - + diff --git a/tests/data/test1400 b/tests/data/test1400 index a92b2f22e0..837a20b093 100644 --- a/tests/data/test1400 +++ b/tests/data/test1400 @@ -31,7 +31,7 @@ http SSL_CERT_FILE= -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c @@ -55,7 +55,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/ $_ = '' if /CURLOPT_HTTP09_ALLOWED/ $_ = '' if /CURLOPT_INTERLEAVEDATA/ - + /********* Sample code generated by the curl command line tool ********** * All curl_easy_setopt() options are documented at: * https://curl.se/libcurl/c/curl_easy_setopt.html diff --git a/tests/data/test1401 b/tests/data/test1401 index bbd3e7b648..1706545915 100644 --- a/tests/data/test1401 +++ b/tests/data/test1401 @@ -40,7 +40,7 @@ file SSL_CERT_FILE= -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c --basic -u fake:user -H "X-Files: Mulder" -H "X-Men: cyclops, iceman" -A MyUA -b chocolate=chip --proto "=http,ftp,file" +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c --basic -u fake:user -H "X-Files: Mulder" -H "X-Men: cyclops, iceman" -A MyUA -b chocolate=chip --proto "=http,ftp,file" @@ -65,7 +65,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ $_ = '' if /CURLOPT_INTERLEAVEDATA/ - + /********* Sample code generated by the curl command line tool ********** * All curl_easy_setopt() options are documented at: * https://curl.se/libcurl/c/curl_easy_setopt.html diff --git a/tests/data/test1402 b/tests/data/test1402 index 667be124c0..5003ba8f3e 100644 --- a/tests/data/test1402 +++ b/tests/data/test1402 @@ -32,7 +32,7 @@ http SSL_CERT_FILE= -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c -d "foo=bar" -d "baz=quux" +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c -d "foo=bar" -d "baz=quux" @@ -58,7 +58,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ $_ = '' if /CURLOPT_INTERLEAVEDATA/ - + /********* Sample code generated by the curl command line tool ********** * All curl_easy_setopt() options are documented at: * https://curl.se/libcurl/c/curl_easy_setopt.html diff --git a/tests/data/test1403 b/tests/data/test1403 index 5ecf2d28cc..3eab6222d5 100644 --- a/tests/data/test1403 +++ b/tests/data/test1403 @@ -32,7 +32,7 @@ http SSL_CERT_FILE= -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c -G -d "foo=bar" -d "baz=quux" +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c -G -d "foo=bar" -d "baz=quux" @@ -55,7 +55,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ $_ = '' if /CURLOPT_INTERLEAVEDATA/ - + /********* Sample code generated by the curl command line tool ********** * All curl_easy_setopt() options are documented at: * https://curl.se/libcurl/c/curl_easy_setopt.html diff --git a/tests/data/test1404 b/tests/data/test1404 index ae37c3065b..f18ad8a39d 100644 --- a/tests/data/test1404 +++ b/tests/data/test1404 @@ -36,10 +36,10 @@ http SSL_CERT_FILE= -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@log/test%TESTNUMBER.txt,log/test%TESTNUMBER.txt;type=magic/content;encoder=8bit,log/test%TESTNUMBER.txt;headers=X-testheader-1: header 1;headers=X-testheader-2: header 2' --libcurl log/test%TESTNUMBER.c +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=value -F 'file=@%LOGDIR/test%TESTNUMBER.txt,%LOGDIR/test%TESTNUMBER.txt;type=magic/content;encoder=8bit,%LOGDIR/test%TESTNUMBER.txt;headers=X-testheader-1: header 1;headers=X-testheader-2: header 2' --libcurl %LOGDIR/test%TESTNUMBER.c # We create this file before the command is invoked! - + dummy data @@ -101,7 +101,7 @@ $_ = '' if /CURLOPT_INTERLEAVEDATA/ # CURL_DOES_CONVERSION generates an extra comment. $_ = '' if /\/\* "value" \*\// - + /********* Sample code generated by the curl command line tool ********** * All curl_easy_setopt() options are documented at: * https://curl.se/libcurl/c/curl_easy_setopt.html @@ -134,13 +134,13 @@ int main(int argc, char *argv[]) part1 = curl_mime_addpart(mime1); mime2 = curl_mime_init(hnd); part2 = curl_mime_addpart(mime2); - curl_mime_filedata(part2, "log/test%TESTNUMBER.txt"); + curl_mime_filedata(part2, "%LOGDIR/test%TESTNUMBER.txt"); part2 = curl_mime_addpart(mime2); - curl_mime_filedata(part2, "log/test%TESTNUMBER.txt"); + curl_mime_filedata(part2, "%LOGDIR/test%TESTNUMBER.txt"); curl_mime_encoder(part2, "8bit"); curl_mime_type(part2, "magic/content"); part2 = curl_mime_addpart(mime2); - curl_mime_filedata(part2, "log/test%TESTNUMBER.txt"); + curl_mime_filedata(part2, "%LOGDIR/test%TESTNUMBER.txt"); curl_mime_headers(part2, slist1, 1); slist1 = NULL; curl_mime_subparts(part1, mime2); diff --git a/tests/data/test1405 b/tests/data/test1405 index 31b7d6971a..5bb0450e63 100644 --- a/tests/data/test1405 +++ b/tests/data/test1405 @@ -36,7 +36,7 @@ ftp SSL_CERT_FILE= -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD" --libcurl log/test%TESTNUMBER.c +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -Q "NOOP 1" -Q "+NOOP 2" -Q "-NOOP 3" -Q "*FAIL" -Q "+*FAIL HARD" --libcurl %LOGDIR/test%TESTNUMBER.c @@ -58,7 +58,7 @@ RETR %TESTNUMBER NOOP 3 QUIT - + /********* Sample code generated by the curl command line tool ********** * All curl_easy_setopt() options are documented at: * https://curl.se/libcurl/c/curl_easy_setopt.html diff --git a/tests/data/test1406 b/tests/data/test1406 index 0be9bfa615..3a00b44db4 100644 --- a/tests/data/test1406 +++ b/tests/data/test1406 @@ -28,14 +28,14 @@ smtp SSL_CERT_FILE= - + From: different To: another body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml --libcurl log/test%TESTNUMBER.c +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient.one@example.com --mail-rcpt recipient.two@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml --libcurl %LOGDIR/test%TESTNUMBER.c @@ -57,7 +57,7 @@ To: another body . - + /********* Sample code generated by the curl command line tool ********** * All curl_easy_setopt() options are documented at: * https://curl.se/libcurl/c/curl_easy_setopt.html diff --git a/tests/data/test1407 b/tests/data/test1407 index d5bfb7f5d3..160c86449e 100644 --- a/tests/data/test1407 +++ b/tests/data/test1407 @@ -30,7 +30,7 @@ pop3 SSL_CERT_FILE= -pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret --libcurl log/test%TESTNUMBER.c +pop3://%HOSTIP:%POP3PORT/%TESTNUMBER -l -u user:secret --libcurl %LOGDIR/test%TESTNUMBER.c @@ -44,7 +44,7 @@ PASS secret LIST %TESTNUMBER QUIT - + /********* Sample code generated by the curl command line tool ********** * All curl_easy_setopt() options are documented at: * https://curl.se/libcurl/c/curl_easy_setopt.html diff --git a/tests/data/test1408 b/tests/data/test1408 index adecc9bf5f..e27923ad76 100644 --- a/tests/data/test1408 +++ b/tests/data/test1408 @@ -49,7 +49,7 @@ http-ipv6 HTTP receive cookies over IPV6 --c log/jar%TESTNUMBER -g http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0001 http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0002 +-c %LOGDIR/jar%TESTNUMBER -g http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0001 http://%HOST6IP:%HTTP6PORT/path/%TESTNUMBER0002 diff --git a/tests/data/test1411 b/tests/data/test1411 index a7d23ee2f1..47b36f2b91 100644 --- a/tests/data/test1411 +++ b/tests/data/test1411 @@ -36,10 +36,10 @@ http HTTP with zero size file PUT -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/empty%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/empty%TESTNUMBER # create an empty file - + diff --git a/tests/data/test1415 b/tests/data/test1415 index 7d460be236..82f83790a5 100644 --- a/tests/data/test1415 +++ b/tests/data/test1415 @@ -44,7 +44,7 @@ Delete expired cookies TZ=GMT -http://example.com/we/want/%TESTNUMBER -b none -c log/jar%TESTNUMBER.txt -x %HOSTIP:%HTTPPORT +http://example.com/we/want/%TESTNUMBER -b none -c %LOGDIR/jar%TESTNUMBER.txt -x %HOSTIP:%HTTPPORT cookies @@ -63,7 +63,7 @@ Proxy-Connection: Keep-Alive - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test1417 b/tests/data/test1417 index a0dd086d57..4400cec0ce 100644 --- a/tests/data/test1417 +++ b/tests/data/test1417 @@ -49,7 +49,7 @@ http HTTP GET with chunked encoding and chunked trailer without CRs -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER @@ -63,7 +63,7 @@ User-Agent: curl/%VERSION Accept: */* - + HTTP/1.1 200 funky chunky! Server: fakeit/0.9 fakeitbad/1.0 Transfer-Encoding: chunked diff --git a/tests/data/test1420 b/tests/data/test1420 index 415e35902b..e6f899f417 100644 --- a/tests/data/test1420 +++ b/tests/data/test1420 @@ -36,7 +36,7 @@ imap SSL_CERT_FILE= -'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret --libcurl log/test%TESTNUMBER.c +'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=1' -u user:secret --libcurl %LOGDIR/test%TESTNUMBER.c @@ -50,7 +50,7 @@ A003 SELECT %TESTNUMBER A004 FETCH 1 BODY[] A005 LOGOUT - + /********* Sample code generated by the curl command line tool ********** * All curl_easy_setopt() options are documented at: * https://curl.se/libcurl/c/curl_easy_setopt.html diff --git a/tests/data/test1422 b/tests/data/test1422 index 7cd1d13456..c62c2cbdae 100644 --- a/tests/data/test1422 +++ b/tests/data/test1422 @@ -37,10 +37,10 @@ http HTTP GET with -O -J and Content-Disposition (empty file) -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O file://%PWD/log/name%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O file://%PWD/%LOGDIR/name%TESTNUMBER @@ -55,7 +55,7 @@ Accept: */* - + diff --git a/tests/data/test1423 b/tests/data/test1423 index 2eb1d8003a..f269cc0b04 100644 --- a/tests/data/test1423 +++ b/tests/data/test1423 @@ -30,10 +30,10 @@ file HTTP GET -o fname without Content-Disposition (empty file) -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER file://%PWD/log/outfile%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER file://%PWD/%LOGDIR/outfile%TESTNUMBER -perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER +perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER @@ -48,7 +48,7 @@ Accept: */* - + diff --git a/tests/data/test1424 b/tests/data/test1424 index ebe5f5213b..640582549d 100644 --- a/tests/data/test1424 +++ b/tests/data/test1424 @@ -46,11 +46,11 @@ http HTTP GET -o fname without Content-Disposition (unmet time condition) - + original contents -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT" -o log/outfile%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -z "dec 12 11:00:00 1999 GMT" -o %LOGDIR/outfile%TESTNUMBER @@ -66,7 +66,7 @@ If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT - + original contents diff --git a/tests/data/test1434 b/tests/data/test1434 index 4801ee2c02..75baba7e82 100644 --- a/tests/data/test1434 +++ b/tests/data/test1434 @@ -60,7 +60,7 @@ HTTP GET resume at exactly the existing file size is fine http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 100 - + 012345678 012345678 012345678 diff --git a/tests/data/test1440 b/tests/data/test1440 index e87cafb081..dbdfc73619 100644 --- a/tests/data/test1440 +++ b/tests/data/test1440 @@ -19,7 +19,7 @@ file Check --write-out with trailing %{ -file://localhost/%PWD/log/non-existent-file.txt --write-out '%{' +file://localhost/%PWD/%LOGDIR/non-existent-file.txt --write-out '%{' diff --git a/tests/data/test1441 b/tests/data/test1441 index 8d841df5d4..2ff6be036a 100644 --- a/tests/data/test1441 +++ b/tests/data/test1441 @@ -19,7 +19,7 @@ file Check --write-out with trailing % -file://localhost/%PWD/log/non-existent-file.txt --write-out '%' +file://localhost/%PWD/%LOGDIR/non-existent-file.txt --write-out '%' diff --git a/tests/data/test1442 b/tests/data/test1442 index 255a4c9ff0..02ecea67f6 100644 --- a/tests/data/test1442 +++ b/tests/data/test1442 @@ -19,7 +19,7 @@ file Check --write-out with trailing \ -file://localhost/%PWD/log/non-existent-file.txt --write-out '\' +file://localhost/%PWD/%LOGDIR/non-existent-file.txt --write-out '\' diff --git a/tests/data/test1443 b/tests/data/test1443 index a59958ae73..bbfaf7f1b8 100644 --- a/tests/data/test1443 +++ b/tests/data/test1443 @@ -37,7 +37,7 @@ http HTTP GET with -O and --remote-time -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time @@ -45,7 +45,7 @@ http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O --remote-time # Verify the mtime of the file. The mtime is specifically chosen to be an even # number so that it can be represented exactly on a FAT filesystem. -perl -e 'exit((stat("log/%TESTNUMBER"))[9] != 960898200)' +perl -e 'exit((stat("%LOGDIR/%TESTNUMBER"))[9] != 960898200)' @@ -59,7 +59,7 @@ User-Agent: curl/%VERSION Accept: */* - + 12345 diff --git a/tests/data/test1444 b/tests/data/test1444 index 71b5f0ea06..7d79fbbab2 100644 --- a/tests/data/test1444 +++ b/tests/data/test1444 @@ -31,7 +31,7 @@ ftp://%HOSTIP:%FTPPORT/%TESTNUMBER --remote-time # Verify the mtime of the file. The mtime is specifically chosen to be an even # number so that it can be represented exactly on a FAT filesystem. -perl -e 'exit((stat("log/curl%TESTNUMBER.out"))[9] != 1234567890)' +perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 1234567890)' diff --git a/tests/data/test1445 b/tests/data/test1445 index 1811e071fe..7fb1d1df6c 100644 --- a/tests/data/test1445 +++ b/tests/data/test1445 @@ -15,17 +15,17 @@ FILE file -perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir file:// with --remote-time -file://localhost%FILE_PWD/log/test%TESTNUMBER.dir/plainfile.txt --remote-time +file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt --remote-time -perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir && \ -perl -e 'exit((stat("log/curl%TESTNUMBER.out"))[9] != 946728000)' +perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \ +perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 946728000)' diff --git a/tests/data/test1446 b/tests/data/test1446 index 0088375b43..189f0dfa6d 100644 --- a/tests/data/test1446 +++ b/tests/data/test1446 @@ -18,17 +18,17 @@ SFTP sftp -perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir SFTP with --remote-time ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/rofile.txt --insecure --remote-time +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/rofile.txt --insecure --remote-time -perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir && \ -perl -e 'exit((stat("log/curl%TESTNUMBER.out"))[9] != 978264000)' +perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir && \ +perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 978264000)' diff --git a/tests/data/test1459 b/tests/data/test1459 index e8c2b00c52..2a69a60330 100644 --- a/tests/data/test1459 +++ b/tests/data/test1459 @@ -13,7 +13,7 @@ known_hosts sftp -mkdir -p %PWD/log/test%TESTNUMBER.dir/.ssh +mkdir -p %PWD/%LOGDIR/test%TESTNUMBER.dir/.ssh sftp @@ -25,12 +25,12 @@ SFTP with corrupted known_hosts -u : sftp://%HOSTIP:%SSHPORT/ -l - + |1|qy29Y1x/+/F39AzdG5515YSSw+c=|iB2WX5jrU3ZTWc+ZfGau7HHEvBc= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAynDN8cDJ3xNzRjTNNGciSHSxpubxhZ6YnkLdp1TkrGW8n\ R93Ey5VtBeBblYTRlFXBWJgKFcTKBRJ/O4qBZwbUgt10AHj31i6h8NehfT19tR8wG/YCmj3KtYLHmwdzmW1edEL9G2NdX2KiKYv7/zuly3QvmP0QA0NhWkAz0KdWNM= -CURL_HOME=%PWD/log/test%TESTNUMBER.dir +CURL_HOME=%PWD/%LOGDIR/test%TESTNUMBER.dir diff --git a/tests/data/test1460 b/tests/data/test1460 index 8f6b5f2937..c3180ff923 100644 --- a/tests/data/test1460 +++ b/tests/data/test1460 @@ -34,12 +34,12 @@ http HTTP GET with -Ji and Content-Disposition with existing file -CURL_TESTDIR=%PWD/log +CURL_TESTDIR=%LOGDIR http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Ji -O - + initial content @@ -51,7 +51,7 @@ initial content 2 - + initial content diff --git a/tests/data/test1465 b/tests/data/test1465 index 1a28fb1c3f..341237d24e 100644 --- a/tests/data/test1465 +++ b/tests/data/test1465 @@ -32,10 +32,10 @@ http SSL_CERT_FILE= -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c --data-binary @log/%TESTNUMBER-upload +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c --data-binary @%LOGDIR/%TESTNUMBER-upload # "ab\x81""cd\0e\\\"?\r\n\t\x01""fghi%x1Ajklm%xFD" - + %hex[ab%81cd%00e\"?%0D%0A%09%01fghi%1Ajklm%FD]hex% @@ -61,7 +61,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/ $_ = '' if /CURLOPT_HTTP_VERSION/ $_ = '' if /CURLOPT_INTERLEAVEDATA/ - + /********* Sample code generated by the curl command line tool ********** * All curl_easy_setopt() options are documented at: * https://curl.se/libcurl/c/curl_easy_setopt.html diff --git a/tests/data/test1469 b/tests/data/test1469 index 5161c39bbe..f2b3882cb2 100644 --- a/tests/data/test1469 +++ b/tests/data/test1469 @@ -16,7 +16,7 @@ none Space in FTP upload URL -"ftp://%HOSTIP:%NOLISTENPORT/%TESTNUMBER%/with space/" -T log/irrelevant-file +"ftp://%HOSTIP:%NOLISTENPORT/%TESTNUMBER%/with space/" -T %LOGDIR/irrelevant-file diff --git a/tests/data/test149 b/tests/data/test149 index 94ca5f793c..e01c3f1280 100644 --- a/tests/data/test149 +++ b/tests/data/test149 @@ -18,9 +18,9 @@ ftp FTP with multiple uploads --T log/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir1/%TESTNUMBER -T log/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir2/%TESTNUMBER +-T %LOGDIR/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir1/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER ftp://%HOSTIP:%FTPPORT/dir2/%TESTNUMBER - + send away this contents @@ -46,7 +46,7 @@ EPSV STOR %TESTNUMBER QUIT - + send away this contents diff --git a/tests/data/test1506 b/tests/data/test1506 index 07d3aac99e..2cad631ba5 100644 --- a/tests/data/test1506 +++ b/tests/data/test1506 @@ -82,7 +82,7 @@ Accept: */* ^Host:.* - + * Connection #0 to host server1.example.com left intact * Connection #1 to host server2.example.com left intact * Connection #2 to host server3.example.com left intact diff --git a/tests/data/test1508 b/tests/data/test1508 index 02cb90a671..78ff18fb3d 100644 --- a/tests/data/test1508 +++ b/tests/data/test1508 @@ -24,7 +24,7 @@ http://%HOSTIP:%NOLISTENPORT/path/%TESTNUMBER # Verify data after the test has been "shot" - + We are done diff --git a/tests/data/test1509 b/tests/data/test1509 index baa0a30ca9..5bf55cb633 100644 --- a/tests/data/test1509 +++ b/tests/data/test1509 @@ -62,7 +62,7 @@ simple multi http:// through proxytunnel with authentication info http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT - + foo bar bar diff --git a/tests/data/test1510 b/tests/data/test1510 index d021dfee67..eccbb6c942 100644 --- a/tests/data/test1510 +++ b/tests/data/test1510 @@ -82,7 +82,7 @@ Accept: */* ^Host:.* - + * Connection #0 to host server1.example.com left intact * Connection #1 to host server2.example.com left intact * Connection #2 to host server3.example.com left intact diff --git a/tests/data/test1524 b/tests/data/test1524 index 65831ddc5d..b5ac86610b 100644 --- a/tests/data/test1524 +++ b/tests/data/test1524 @@ -45,9 +45,9 @@ http HTTP PUT with 303 redirect -http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -T log/upload%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -T %LOGDIR/upload%TESTNUMBER.txt - + moo diff --git a/tests/data/test154 b/tests/data/test154 index 0b180b90a9..a05eb8aea5 100644 --- a/tests/data/test154 +++ b/tests/data/test154 @@ -67,9 +67,9 @@ crypto HTTP PUT with --anyauth authorization (picking Digest) -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth - + This is data we upload with PUT a second line line three diff --git a/tests/data/test1542 b/tests/data/test1542 index cead5a0e87..d9fece4166 100644 --- a/tests/data/test1542 +++ b/tests/data/test1542 @@ -54,7 +54,7 @@ Host: %HOSTIP:%HTTPPORT Accept: */* - + == Info: Connection #0 to host %HOSTIP left intact == Info: Connection #0 to host %HOSTIP left intact == Info: Connection #0 to host %HOSTIP left intact diff --git a/tests/data/test155 b/tests/data/test155 index 353edb9fa8..83aed115f8 100644 --- a/tests/data/test155 +++ b/tests/data/test155 @@ -84,9 +84,9 @@ http HTTP PUT with --anyauth authorization (picking NTLM) -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth - + This is data we upload with PUT a second line line three diff --git a/tests/data/test1558 b/tests/data/test1558 index 26854c2dde..46332d198c 100644 --- a/tests/data/test1558 +++ b/tests/data/test1558 @@ -24,9 +24,9 @@ lib%TESTNUMBER CURLINFO_PROTOCOL for file:// transfer -file://%FILE_PWD/log/data%TESTNUMBER +file://%FILE_PWD/%LOGDIR/data%TESTNUMBER - + hello diff --git a/tests/data/test156 b/tests/data/test156 index 35de74d240..214b5396ee 100644 --- a/tests/data/test156 +++ b/tests/data/test156 @@ -28,9 +28,9 @@ http HTTP PUT with --anyauth (when the server requires none) -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth - + This is data we upload with PUT a second line line three diff --git a/tests/data/test1561 b/tests/data/test1561 index 908b31c296..7dbce1108b 100644 --- a/tests/data/test1561 +++ b/tests/data/test1561 @@ -72,7 +72,7 @@ https Cookies set over HTTP can't override secure ones --k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001 -L -c log/jar%TESTNUMBER.txt -H "Host: www.example.com" http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 -L -c log/jar%TESTNUMBER.txt -H "Host: www.example.com" +-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER0001 -L -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.example.com" http://%HOSTIP:%HTTPPORT/%TESTNUMBER0002 -L -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.example.com" @@ -88,7 +88,7 @@ User-Agent: curl/%VERSION Accept: */* - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test1566 b/tests/data/test1566 index b954c2aeab..be047dcebb 100644 --- a/tests/data/test1566 +++ b/tests/data/test1566 @@ -32,12 +32,12 @@ http --etag-compare that gets a 304 back shouldn't overwrite the file -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/output%TESTNUMBER --etag-compare log/etag%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/output%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER - + "123456" - + downloaded already @@ -56,7 +56,7 @@ If-None-Match: "123456" # verify that the target file is untouched - + downloaded already diff --git a/tests/data/test163 b/tests/data/test163 index b763c3ca89..45af183605 100644 --- a/tests/data/test163 +++ b/tests/data/test163 @@ -30,10 +30,10 @@ http HTTP multipart formpost with contents from a file -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name= # We create this file before the command is invoked! - + contents from a diff --git a/tests/data/test1654 b/tests/data/test1654 index ef6657494c..3bd6f65c01 100644 --- a/tests/data/test1654 +++ b/tests/data/test1654 @@ -24,9 +24,9 @@ CURL_TIME=1548369261 alt-svc -log/%TESTNUMBER +%LOGDIR/%TESTNUMBER - + h2 example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 1 # a comment h2 foo.example.com 443 h3 shiny.example.com 8443 "20291231 23:30:00" 0 1 @@ -38,7 +38,7 @@ rubbish - + # Your alt-svc cache. https://curl.se/docs/alt-svc.html # This file was generated by libcurl! Edit at your own risk. h2 example.com 443 h3 shiny.example.com 8443 "20191231 00:00:00" 0 1 diff --git a/tests/data/test166 b/tests/data/test166 index bcbf377555..40892a87fd 100644 --- a/tests/data/test166 +++ b/tests/data/test166 @@ -30,10 +30,10 @@ http HTTP formpost a file with spaces in name -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=@log/fie ld %TESTNUMBER" +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=@%LOGDIR/fie ld %TESTNUMBER" # We create this file before the command is invoked! - + data inside the file diff --git a/tests/data/test1660 b/tests/data/test1660 index cbbcf7587c..e21fec4752 100644 --- a/tests/data/test1660 +++ b/tests/data/test1660 @@ -15,7 +15,7 @@ unittest HSTS - + # Your HSTS cache. https://curl.se/docs/hsts.html # This file was generated by libcurl! Edit at your own risk. .readfrom.example "20211001 04:47:41" @@ -72,7 +72,7 @@ expire.example [expire.example]: 1548369268 'expire.example' is not HSTS 'expire.example' is not HSTS - + # Your HSTS cache. https://curl.se/docs/hsts.html # This file was generated by libcurl! Edit at your own risk. .new.example "unlimited" diff --git a/tests/data/test1670 b/tests/data/test1670 index 6d8722f618..34d79f766f 100644 --- a/tests/data/test1670 +++ b/tests/data/test1670 @@ -40,7 +40,7 @@ http -w individual header output -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%header{etag} %header{nope} %header{DATE}\n' -o log/%TESTNUMBER.out +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%header{etag} %header{nope} %header{DATE}\n' -o %LOGDIR/%TESTNUMBER.out diff --git a/tests/data/test1671 b/tests/data/test1671 index 09b4155129..43753b527d 100644 --- a/tests/data/test1671 +++ b/tests/data/test1671 @@ -43,7 +43,7 @@ http -w header JSON output -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{header_json}\n' -o log/%TESTNUMBER.out +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -w '%{header_json}\n' -o %LOGDIR/%TESTNUMBER.out diff --git a/tests/data/test1680 b/tests/data/test1680 index 7d8167c0e2..4775a411b0 100644 --- a/tests/data/test1680 +++ b/tests/data/test1680 @@ -33,9 +33,9 @@ http http -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/exist%TESTNUMBER --clobber +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/exist%TESTNUMBER --clobber - + to be overwritten @@ -43,7 +43,7 @@ to be overwritten # # Verify data after the test has been "shot" - + HTTP/1.0 200 OK Connection: close Content-Type: text/plain diff --git a/tests/data/test1681 b/tests/data/test1681 index cfc8a5db81..16c0d8c505 100644 --- a/tests/data/test1681 +++ b/tests/data/test1681 @@ -33,9 +33,9 @@ http http -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/exist%TESTNUMBER --no-clobber -w '%{filename_effective}\n' +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/exist%TESTNUMBER --no-clobber -w '%{filename_effective}\n' - + to stay the same @@ -43,10 +43,10 @@ to stay the same # # Verify data after the test has been "shot" - + to stay the same - + HTTP/1.0 200 OK Connection: close Content-Type: text/plain @@ -55,7 +55,7 @@ Content-Length: 4 foo -log/exist%TESTNUMBER.1 +%LOGDIR/exist%TESTNUMBER.1 diff --git a/tests/data/test1682 b/tests/data/test1682 index e981c20e95..b5462ab05b 100644 --- a/tests/data/test1682 +++ b/tests/data/test1682 @@ -33,9 +33,9 @@ http http -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --output-dir log -o exist%TESTNUMBER --no-clobber +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --output-dir %LOGDIR -o exist%TESTNUMBER --no-clobber - + to stay the same @@ -43,10 +43,10 @@ to stay the same # # Verify data after the test has been "shot" - + to stay the same - + HTTP/1.0 200 OK Connection: close Content-Type: text/plain diff --git a/tests/data/test1683 b/tests/data/test1683 index 93d27d73c6..178b4054dc 100644 --- a/tests/data/test1683 +++ b/tests/data/test1683 @@ -33,18 +33,18 @@ http http -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/exist%TESTNUMBER --no-clobber +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/exist%TESTNUMBER --no-clobber - + to stay the same -perl -e 'for my $i ((1..100)) { my $filename = "log/exist%TESTNUMBER.$i"; open(FH, ">", $filename) or die $!; print FH "to stay the same" ; close(FH) }' -# python3 -c 'for i in range(1, 101): open("log/exist%TESTNUMBER.{}".format(i), mode="w").write("to stay the same")' +perl -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; open(FH, ">", $filename) or die $!; print FH "to stay the same" ; close(FH) }' +# python3 -c 'for i in range(1, 101): open("%LOGDIR/exist%TESTNUMBER.{}".format(i), mode="w").write("to stay the same")' -perl -e 'for my $i ((1..100)) { my $filename = "log/exist%TESTNUMBER.$i"; open(FH, "<", $filename) or die $!; ( eq "to stay the same" and eq "") or die "incorrect $filename" ; close(FH) }' -# python3 -c 'for i in range(1, 101): assert open("log/exist%TESTNUMBER.{}".format(i), mode="r").read(17) == "to stay the same"' +perl -e 'for my $i ((1..100)) { my $filename = "%LOGDIR/exist%TESTNUMBER.$i"; open(FH, "<", $filename) or die $!; ( eq "to stay the same" and eq "") or die "incorrect $filename" ; close(FH) }' +# python3 -c 'for i in range(1, 101): assert open("%LOGDIR/exist%TESTNUMBER.{}".format(i), mode="r").read(17) == "to stay the same"' @@ -54,7 +54,7 @@ perl -e 'for my $i ((1..100)) { my $filename = "log/exist%TESTNUMBER.$i"; open(F 23 - + to stay the same diff --git a/tests/data/test1703 b/tests/data/test1703 index a6a4d9fe15..bdc6476323 100644 --- a/tests/data/test1703 +++ b/tests/data/test1703 @@ -28,9 +28,9 @@ win32 basic file:// file with UTF-8 characters -file://localhost%FILE_PWD/log/%E3%83%86%E3%82%B9%E3%83%88%TESTNUMBER.txt +file://localhost%FILE_PWD/%LOGDIR/%E3%83%86%E3%82%B9%E3%83%88%TESTNUMBER.txt - + foo bar bar diff --git a/tests/data/test171 b/tests/data/test171 index dc46fe287c..d56296f4e6 100644 --- a/tests/data/test171 +++ b/tests/data/test171 @@ -31,7 +31,7 @@ http HTTP, get cookie with dot prefixed full domain --c log/jar%TESTNUMBER -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER +-c %LOGDIR/jar%TESTNUMBER -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER cookies @@ -49,7 +49,7 @@ Accept: */* Proxy-Connection: Keep-Alive - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test172 b/tests/data/test172 index 276856ae0f..bf4871931d 100644 --- a/tests/data/test172 +++ b/tests/data/test172 @@ -27,9 +27,9 @@ http HTTP with cookies file and custom added cookie -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/jar%TESTNUMBER.txt -b "tool=curl; name=fool" +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b %LOGDIR/jar%TESTNUMBER.txt -b "tool=curl; name=fool" - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test179 b/tests/data/test179 index 61c633440f..4bfceb1ac4 100644 --- a/tests/data/test179 +++ b/tests/data/test179 @@ -31,9 +31,9 @@ http HTTP using proxy and cookies with path checks -http://supertrooper.fake/c/%TESTNUMBER -b log/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT +http://supertrooper.fake/c/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT - + supertrooper.fake FALSE /a FALSE 2139150993 mooo indeed supertrooper.fake FALSE /b FALSE 0 moo1 indeed supertrooper.fake FALSE /c FALSE 2139150993 moo2 indeed diff --git a/tests/data/test180 b/tests/data/test180 index 32ecd00a9a..dcb616fd05 100644 --- a/tests/data/test180 +++ b/tests/data/test180 @@ -27,9 +27,9 @@ http HTTP 1.0 PUT -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt --http1.0 +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --http1.0 - + Weird file to diff --git a/tests/data/test181 b/tests/data/test181 index f496c29469..71dd427bf4 100644 --- a/tests/data/test181 +++ b/tests/data/test181 @@ -27,9 +27,9 @@ http HTTP 1.0 POST -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --data-binary @log/test%TESTNUMBER.txt --http1.0 +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --data-binary @%LOGDIR/test%TESTNUMBER.txt --http1.0 - + Weird file to diff --git a/tests/data/test1903 b/tests/data/test1903 index 16704e893c..5a4d3e0a50 100644 --- a/tests/data/test1903 +++ b/tests/data/test1903 @@ -35,7 +35,7 @@ lib%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test1905 b/tests/data/test1905 index 7a19e68b7f..cf2498ff93 100644 --- a/tests/data/test1905 +++ b/tests/data/test1905 @@ -48,7 +48,7 @@ Host: %HOSTIP:%HTTPPORT Accept: */* - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test1908 b/tests/data/test1908 index 0ac0e8626f..69058a2086 100644 --- a/tests/data/test1908 +++ b/tests/data/test1908 @@ -72,7 +72,7 @@ Accept: */* # matches s/\"([^\"]*)\"/TIMESTAMP/ - + # Your alt-svc cache. https://curl.se/docs/alt-svc.html # This file was generated by libcurl! Edit at your own risk. h1 127.0.0.1 %HTTPPORT h2 3dbbdetxoyw4nsp6c3cc456oj2ays6s43ezxzsfxxri3h5xqd.example 443 TIMESTAMP 1 0 diff --git a/tests/data/test1909 b/tests/data/test1909 index 64e7b0526e..c412d41e06 100644 --- a/tests/data/test1909 +++ b/tests/data/test1909 @@ -36,7 +36,7 @@ http HTTP GET --retry-all-errors to overcome partial transfer ---retry 1 --retry-all-errors -o log/outfile%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER +--retry 1 --retry-all-errors -o %LOGDIR/outfile%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER @@ -56,7 +56,7 @@ Accept: */* - + data diff --git a/tests/data/test200 b/tests/data/test200 index e7c5146f77..7ce2cbcfea 100644 --- a/tests/data/test200 +++ b/tests/data/test200 @@ -24,9 +24,9 @@ file basic file:// file -file://localhost%FILE_PWD/log/test%TESTNUMBER.txt +file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + foo bar bar diff --git a/tests/data/test2000 b/tests/data/test2000 index 32604c6f31..b114dd8aff 100644 --- a/tests/data/test2000 +++ b/tests/data/test2000 @@ -32,9 +32,9 @@ file FTP RETR followed by FILE -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER file://localhost%FILE_PWD/log/test%TESTNUMBER.txt +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + foo bar bar diff --git a/tests/data/test2001 b/tests/data/test2001 index e85fd1ffc2..f1e7146753 100644 --- a/tests/data/test2001 +++ b/tests/data/test2001 @@ -49,9 +49,9 @@ file HTTP GET followed by FTP RETR followed by FILE -http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + foo bar bar diff --git a/tests/data/test2002 b/tests/data/test2002 index 2cd28016b9..1616cade17 100644 --- a/tests/data/test2002 +++ b/tests/data/test2002 @@ -58,9 +58,9 @@ tftp HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ -http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 +http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 - + foo bar bar diff --git a/tests/data/test2003 b/tests/data/test2003 index a1d5a9fc22..8af42538b9 100644 --- a/tests/data/test2003 +++ b/tests/data/test2003 @@ -58,9 +58,9 @@ tftp HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ then again in reverse order -http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 +http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER0003 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001 - + foo bar bar diff --git a/tests/data/test2004 b/tests/data/test2004 index 17a73167ae..9f41ce76c9 100644 --- a/tests/data/test2004 +++ b/tests/data/test2004 @@ -30,9 +30,9 @@ sftp TFTP RRQ followed by SFTP retrieval followed by FILE followed by SCP retrieval then again in reverse order ---key curl_client_key --pubkey curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.txt file://localhost%FILE_PWD/log/test%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.txt file://localhost%FILE_PWD/log/test%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.txt file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.txt file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//%TESTNUMBER --insecure - + This is test data for several protocols diff --git a/tests/data/test201 b/tests/data/test201 index 8e9f190b78..b68abb8c00 100644 --- a/tests/data/test201 +++ b/tests/data/test201 @@ -21,7 +21,7 @@ file missing file:// file -file://localhost/%PWD/log/non-existent-file.txt +file://localhost/%PWD/%LOGDIR/non-existent-file.txt diff --git a/tests/data/test202 b/tests/data/test202 index f5efc07328..f2fb078f21 100644 --- a/tests/data/test202 +++ b/tests/data/test202 @@ -20,9 +20,9 @@ file two file:// URLs to stdout -file://localhost%FILE_PWD/log/test%TESTNUMBER.txt FILE://localhost%FILE_PWD/log/test%TESTNUMBER.txt +file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt FILE://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + contents in a single file diff --git a/tests/data/test203 b/tests/data/test203 index d193563841..496a414825 100644 --- a/tests/data/test203 +++ b/tests/data/test203 @@ -29,9 +29,9 @@ file:/path URL with a single slash MSYS2_ARG_CONV_EXCL=file: -file:%FILE_PWD/log/test%TESTNUMBER.txt +file:%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + foo bar bar diff --git a/tests/data/test2039 b/tests/data/test2039 index a10852a7fc..25ecf278a6 100644 --- a/tests/data/test2039 +++ b/tests/data/test2039 @@ -37,9 +37,9 @@ ftp FTP (optional .netrc with 'default' override; no user/pass) dir list PASV ---netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/ - + # the following two lines were created while testing curl default login userdef password passwddef machine %HOSTIP login user1 password passwd1 diff --git a/tests/data/test204 b/tests/data/test204 index dcf0bb5bda..63d17cd57d 100644 --- a/tests/data/test204 +++ b/tests/data/test204 @@ -16,9 +16,9 @@ file "upload" with file:// -file://localhost%FILE_PWD/log/result%TESTNUMBER.txt -T log/upload%TESTNUMBER.txt +file://localhost%FILE_PWD/%LOGDIR/result%TESTNUMBER.txt -T %LOGDIR/upload%TESTNUMBER.txt - + data in file @@ -29,7 +29,7 @@ write # Verify data after the test has been "shot" - + data in file diff --git a/tests/data/test205 b/tests/data/test205 index de04997c3f..e2165ccd10 100644 --- a/tests/data/test205 +++ b/tests/data/test205 @@ -17,9 +17,9 @@ file "upload" with file:// -file://localhost/%PWD/log/nonexisting/result%TESTNUMBER.txt -T log/upload%TESTNUMBER.txt +file://localhost/%PWD/%LOGDIR/nonexisting/result%TESTNUMBER.txt -T %LOGDIR/upload%TESTNUMBER.txt - + data in file diff --git a/tests/data/test2058 b/tests/data/test2058 index ba4a53e844..7561c28fc4 100644 --- a/tests/data/test2058 +++ b/tests/data/test2058 @@ -72,9 +72,9 @@ proxy HTTP POST --digest with PUT, resumed upload, modified method and SHA-256 -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET - + test diff --git a/tests/data/test2059 b/tests/data/test2059 index 4776970d32..0bd5be8c97 100644 --- a/tests/data/test2059 +++ b/tests/data/test2059 @@ -72,9 +72,9 @@ proxy HTTP POST --digest with PUT, resumed upload, modified method, SHA-256 and userhash=true -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET - + test diff --git a/tests/data/test2060 b/tests/data/test2060 index 9a8057d514..85637157be 100644 --- a/tests/data/test2060 +++ b/tests/data/test2060 @@ -72,9 +72,9 @@ proxy HTTP POST --digest with PUT, resumed upload, modified method, SHA-512-256 and userhash=false -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T log/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -u auser:apasswd --digest -T %LOGDIR/%TESTNUMBER -x http://%HOSTIP:%HTTPPORT -C 2 -X GET - + test diff --git a/tests/data/test2071 b/tests/data/test2071 index 900f0d5a89..45ee91737d 100644 --- a/tests/data/test2071 +++ b/tests/data/test2071 @@ -24,9 +24,9 @@ file basic file:// file with "127.0.0.1" hostname -file://127.0.0.1%FILE_PWD/log/test2070.txt +file://127.0.0.1%FILE_PWD/%LOGDIR/test2070.txt - + foo bar bar diff --git a/tests/data/test2072 b/tests/data/test2072 index 179167068e..50cb4b60a6 100644 --- a/tests/data/test2072 +++ b/tests/data/test2072 @@ -24,12 +24,12 @@ file file:// with unix path resolution behavior for the case of extra slashes -file:////%PWD/log/test%TESTNUMBER.txt +file:////%PWD/%LOGDIR/test%TESTNUMBER.txt perl -e "print 'Test requires a unix system' if ( $^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'dos' || $^O eq 'msys');" - + foo bar bar diff --git a/tests/data/test208 b/tests/data/test208 index a6c0eea492..f3ad620ee9 100644 --- a/tests/data/test208 +++ b/tests/data/test208 @@ -33,9 +33,9 @@ proxy HTTP PUT to a FTP URL with username+password - over HTTP proxy --x http://%HOSTIP:%HTTPPORT ftp://daniel:mysecret@host.com/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt +-x http://%HOSTIP:%HTTPPORT ftp://daniel:mysecret@host.com/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt - + Weird file to diff --git a/tests/data/test2080 b/tests/data/test2080 index 9c8d538fc8..8b92c4f13a 100644 Binary files a/tests/data/test2080 and b/tests/data/test2080 differ diff --git a/tests/data/test216 b/tests/data/test216 index 0e74110b19..82629f5915 100644 --- a/tests/data/test216 +++ b/tests/data/test216 @@ -18,9 +18,9 @@ ftp FTP upload two files to the same dir --T log/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ -T log/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/%2e%2eanotherup.%TESTNUMBER +-T %LOGDIR/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/ -T %LOGDIR/upload.%TESTNUMBER ftp://%HOSTIP:%FTPPORT/a/path/%TESTNUMBER/%2e%2eanotherup.%TESTNUMBER - + upload this file twice diff --git a/tests/data/test218 b/tests/data/test218 index 08ee8c6d45..3b67095bf0 100644 --- a/tests/data/test218 +++ b/tests/data/test218 @@ -29,9 +29,9 @@ http HTTP PUT from a file but enforce chunked transfer-encoding - -T log/file%TESTNUMBER -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER + -T %LOGDIR/file%TESTNUMBER -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER - + just some tiny teeny contents diff --git a/tests/data/test2205 b/tests/data/test2205 index 9bc8d3207e..da6f1ddafa 100644 --- a/tests/data/test2205 +++ b/tests/data/test2205 @@ -25,11 +25,11 @@ mqtt MQTT with very long user name - + user = %repeat[65536 x a]%:fakepasswd -mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -K log/input%TESTNUMBER +mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -K %LOGDIR/input%TESTNUMBER diff --git a/tests/data/test2305 b/tests/data/test2305 index 7293db36c3..869f6d36b2 100644 --- a/tests/data/test2305 +++ b/tests/data/test2305 @@ -44,13 +44,13 @@ WebSocket curl_ws_recv() loop reading three larger frames lib%TESTNUMBER -ws://%HOSTIP:%HTTPPORT/%TESTNUMBER log/save%TESTNUMBER +ws://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/save%TESTNUMBER # - + %repeat[256 x helothisisdaniel]% %repeat[256 x helothisisdaniel]% %repeat[256 x helothisisdaniel]% diff --git a/tests/data/test231 b/tests/data/test231 index c925eb1518..64bafa1763 100644 --- a/tests/data/test231 +++ b/tests/data/test231 @@ -23,9 +23,9 @@ file file:// with resume -file://localhost%FILE_PWD/log/test%TESTNUMBER.txt -C 10 +file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt -C 10 - + A01234567 B01234567 C01234567 diff --git a/tests/data/test235 b/tests/data/test235 index e1f2a2f1ee..3ff27cf261 100644 --- a/tests/data/test235 +++ b/tests/data/test235 @@ -21,9 +21,9 @@ ftp FTP resumed upload but no file present remotely -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C - +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C - - + this is the *****crap******** that we're gonna upload worx? diff --git a/tests/data/test236 b/tests/data/test236 index 3a89add7fd..6f59e643e3 100644 --- a/tests/data/test236 +++ b/tests/data/test236 @@ -24,9 +24,9 @@ ftp FTP resume upload but denied access to remote file -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/file%TESTNUMBER.txt -C - +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER.txt -C - - + Test data diff --git a/tests/data/test24 b/tests/data/test24 index bbd5f03947..c275bfd012 100644 --- a/tests/data/test24 +++ b/tests/data/test24 @@ -41,7 +41,7 @@ Accept: */* 22 - + curl: (22) The requested URL returned error: 404 diff --git a/tests/data/test2402 b/tests/data/test2402 index 82d16733d7..57a26b970b 100644 --- a/tests/data/test2402 +++ b/tests/data/test2402 @@ -96,7 +96,7 @@ Via: 2 nghttpx ^Host:.* - + * Connection #0 to host localhost left intact * Connection #0 to host localhost left intact * Connection #0 to host localhost left intact diff --git a/tests/data/test247 b/tests/data/test247 index 7e79d39117..d51034c9e3 100644 --- a/tests/data/test247 +++ b/tests/data/test247 @@ -19,7 +19,7 @@ ftp FTP upload time condition evaluates TRUE => skip upload - + data to see @@ -28,7 +28,7 @@ works so does it? -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00" +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00" diff --git a/tests/data/test248 b/tests/data/test248 index 8881c99d57..4d4c1a69e9 100644 --- a/tests/data/test248 +++ b/tests/data/test248 @@ -19,7 +19,7 @@ ftp FTP upload time condition evaluates FALSE => upload anyway - + data to see @@ -28,7 +28,7 @@ works so does it? -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00" +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -z "apr 1 2005 08:00:00" diff --git a/tests/data/test2502 b/tests/data/test2502 index 0e2ec09b04..5e4a0fd0b3 100644 --- a/tests/data/test2502 +++ b/tests/data/test2502 @@ -91,7 +91,7 @@ Via: 3 nghttpx ^Host:.* - + * Connection #0 to host localhost left intact * Connection #0 to host localhost left intact * Connection #0 to host localhost left intact diff --git a/tests/data/test256 b/tests/data/test256 index 6816bb768d..cbb8714649 100644 --- a/tests/data/test256 +++ b/tests/data/test256 @@ -29,9 +29,9 @@ http HTTP resume request over proxy with auth without server supporting it --x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o log/fewl%TESTNUMBER.txt -U daniel:stenberg +-x http://%HOSTIP:%HTTPPORT http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o %LOGDIR/fewl%TESTNUMBER.txt -U daniel:stenberg - + This text is here to simulate a partly downloaded file to resume download on. @@ -57,7 +57,7 @@ Proxy-Connection: Keep-Alive # the download target file must remain untouched - + This text is here to simulate a partly downloaded file to resume download on. diff --git a/tests/data/test257 b/tests/data/test257 index 701abb777d..ac38ac5fbd 100644 --- a/tests/data/test257 +++ b/tests/data/test257 @@ -71,13 +71,13 @@ http HTTP Location: following with --netrc-optional -http://supersite.com/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file log/netrc%TESTNUMBER +http://supersite.com/want/%TESTNUMBER -L -x http://%HOSTIP:%HTTPPORT --netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER proxy # netrc auth for two out of three sites: - + machine supersite.com login user1 password passwd1 machine anotherone.com login user2 password passwd2 diff --git a/tests/data/test258 b/tests/data/test258 index 748980007f..3587b57a9d 100644 --- a/tests/data/test258 +++ b/tests/data/test258 @@ -65,10 +65,10 @@ proxy HTTP POST multipart without Expect: header using proxy anyauth (Digest) --x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt -H "Expect:" -U uuuser:pppassword --proxy-anyauth +-x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt -H "Expect:" -U uuuser:pppassword --proxy-anyauth # We create this file before the command is invoked! - + foo- This is a moo- bar diff --git a/tests/data/test259 b/tests/data/test259 index 9f64cca125..cc09c5b17d 100644 --- a/tests/data/test259 +++ b/tests/data/test259 @@ -61,10 +61,10 @@ proxy HTTP POST multipart with Expect: header using proxy anyauth (Digest) --x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt -U uuuser:pppassword --proxy-anyauth -H "Expect: 100-continue" +-x http://%HOSTIP:%HTTPPORT http://remotehost:54321/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt -U uuuser:pppassword --proxy-anyauth -H "Expect: 100-continue" # We create this file before the command is invoked! - + foo- This is a moo- bar diff --git a/tests/data/test266 b/tests/data/test266 index 09cca480c6..d30c70aac6 100644 --- a/tests/data/test266 +++ b/tests/data/test266 @@ -53,7 +53,7 @@ http HTTP GET with chunked Transfer-Encoding and chunked trailer -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER @@ -67,7 +67,7 @@ User-Agent: curl/%VERSION Accept: */* - + HTTP/1.1 200 funky chunky! Server: fakeit/0.9 fakeitbad/1.0 Transfer-Encoding: chunked diff --git a/tests/data/test281 b/tests/data/test281 index f92b753af2..06ca27b7c3 100644 --- a/tests/data/test281 +++ b/tests/data/test281 @@ -28,9 +28,9 @@ http HTTP PUT from file with 100 + 401 responses and -f without auth given -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -f -T log/test%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -f -T %LOGDIR/test%TESTNUMBER.txt - + Weird file to diff --git a/tests/data/test285 b/tests/data/test285 index ab055e416f..1b76d19396 100644 --- a/tests/data/test285 +++ b/tests/data/test285 @@ -16,9 +16,9 @@ tftp TFTP send --T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// +-T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// - + a chunk of data sent diff --git a/tests/data/test286 b/tests/data/test286 index febd5e3fb5..4ba0bcdeb6 100644 --- a/tests/data/test286 +++ b/tests/data/test286 @@ -16,9 +16,9 @@ tftp TFTP send of boundary case 512 byte file --T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// +-T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// - + A chunk of data which exactly fits into a 512 byte TFTP block, testing a boundary condition in the TFTP transmit code. diff --git a/tests/data/test288 b/tests/data/test288 index 6ee19d41df..164cf20e76 100644 --- a/tests/data/test288 +++ b/tests/data/test288 @@ -31,9 +31,9 @@ file:// with (unsupported) proxy, authentication and range all_proxy=http://fake:user@%HOSTIP:%NOLISTENPORT/ -file://localhost%FILE_PWD/log/test%TESTNUMBER.txt +file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt - + foo bar bar diff --git a/tests/data/test289 b/tests/data/test289 index 481eacf819..4b80c908cb 100644 --- a/tests/data/test289 +++ b/tests/data/test289 @@ -17,7 +17,7 @@ ftp FTP resume upload but denied access to local file -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/illegal-nonexistent-file -C - +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/illegal-nonexistent-file -C - diff --git a/tests/data/test3008 b/tests/data/test3008 index 31aa4f766b..51afb047e8 100644 --- a/tests/data/test3008 +++ b/tests/data/test3008 @@ -36,7 +36,7 @@ http --output-dir -http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/log +http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR @@ -50,7 +50,7 @@ User-Agent: curl/%VERSION Accept: */* - + -foo- diff --git a/tests/data/test3011 b/tests/data/test3011 index c282cdb782..f5b2f1d8c6 100644 --- a/tests/data/test3011 +++ b/tests/data/test3011 @@ -36,7 +36,7 @@ http --output-dir with --create-dirs -http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/log/tmp --create-dirs +http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR/tmp --create-dirs @@ -50,7 +50,7 @@ User-Agent: curl/%VERSION Accept: */* - + -foo- diff --git a/tests/data/test3012 b/tests/data/test3012 index 1889c937e3..2bd329455c 100644 --- a/tests/data/test3012 +++ b/tests/data/test3012 @@ -39,7 +39,7 @@ http --output-dir with -J -http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -OJ --output-dir %PWD/log +http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -OJ --output-dir %PWD/%LOGDIR @@ -53,7 +53,7 @@ User-Agent: curl/%VERSION Accept: */* - + -foo- diff --git a/tests/data/test3013 b/tests/data/test3013 index 9c0ce445c1..183667e682 100644 --- a/tests/data/test3013 +++ b/tests/data/test3013 @@ -39,7 +39,7 @@ http Two --output-dir with --next in between -http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/log http://%HOSTIP:%HTTPPORT/another/%TESTNUMBER -o second%TESTNUMBER --output-dir %PWD/log +http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR http://%HOSTIP:%HTTPPORT/another/%TESTNUMBER -o second%TESTNUMBER --output-dir %PWD/%LOGDIR @@ -58,10 +58,10 @@ User-Agent: curl/%VERSION Accept: */* - + -foo- - + -foo- diff --git a/tests/data/test3021 b/tests/data/test3021 index 775dd91f82..b2dcfdc9ac 100644 --- a/tests/data/test3021 +++ b/tests/data/test3021 @@ -28,14 +28,14 @@ sftp SFTP correct sha256 host key ---hostpubsha256 %SSHSRVSHA256 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt +--hostpubsha256 %SSHSRVSHA256 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt # Needed for MSYS2 to not treat the argument as a POSIX path list # that has to be converted to Windows paths MSYS2_ARG_CONV_EXCL=* - + test diff --git a/tests/data/test3022 b/tests/data/test3022 index a9dbcb0f2b..fe558c3d51 100644 --- a/tests/data/test3022 +++ b/tests/data/test3022 @@ -28,14 +28,14 @@ scp SCP correct sha256 host key ---hostpubsha256 %SSHSRVSHA256 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt +--hostpubsha256 %SSHSRVSHA256 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt # Needed for MSYS2 to not treat the argument as a POSIX path list # that has to be converted to Windows paths MSYS2_ARG_CONV_EXCL=* - + test diff --git a/tests/data/test3029 b/tests/data/test3029 index a5bc14be45..2e51bbeaf4 100644 --- a/tests/data/test3029 +++ b/tests/data/test3029 @@ -23,12 +23,12 @@ http HTTP with multiple -D --D log/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER --next -D log/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER +-D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER --next -D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Content-Length: 6 diff --git a/tests/data/test3030 b/tests/data/test3030 index b4d7ee38db..7e169cf43a 100644 --- a/tests/data/test3030 +++ b/tests/data/test3030 @@ -23,12 +23,12 @@ http HTTP with multiple transfers in one -D --D log/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER +-D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Content-Length: 6 diff --git a/tests/data/test304 b/tests/data/test304 index b632af74fc..1f6bafb9e9 100644 --- a/tests/data/test304 +++ b/tests/data/test304 @@ -31,10 +31,10 @@ https HTTPS multipart formpost --k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt +-k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt # We create this file before the command is invoked! - + aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/tests/data/test31 b/tests/data/test31 index ad71792d4a..6fe4910d1b 100644 --- a/tests/data/test31 +++ b/tests/data/test31 @@ -128,7 +128,7 @@ HTTP with weirdly formatted cookies and cookiejar storage TZ=GMT -http://test31.curl:%HTTPPORT/we/want/%TESTNUMBER -b none -c log/jar%TESTNUMBER.txt --resolve test31.curl:%HTTPPORT:127.0.0.1 +http://test31.curl:%HTTPPORT/we/want/%TESTNUMBER -b none -c %LOGDIR/jar%TESTNUMBER.txt --resolve test31.curl:%HTTPPORT:127.0.0.1 perl -e "print 'Test requires default test server host' if ( '%HOSTIP' ne '127.0.0.1' );" @@ -147,7 +147,7 @@ User-Agent: curl/%VERSION Accept: */* - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test320 b/tests/data/test320 index 88f99ccdee..77f684b04b 100644 --- a/tests/data/test320 +++ b/tests/data/test320 @@ -58,7 +58,7 @@ simple TLS-SRP HTTPS GET, check user in response - + HTTP/1.0 200 OK Content-type: text/html diff --git a/tests/data/test327 b/tests/data/test327 index 0014b1fe5a..19d7c0fb23 100644 --- a/tests/data/test327 +++ b/tests/data/test327 @@ -43,7 +43,7 @@ http HTTP with cookiejar without cookies left -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -c log/cookies%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002 +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -c %LOGDIR/cookies%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002 cookies @@ -65,7 +65,7 @@ Accept: */* Cookie: foobar=name - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test329 b/tests/data/test329 index 5d3d26338d..1f03d3ce5f 100644 --- a/tests/data/test329 +++ b/tests/data/test329 @@ -31,10 +31,10 @@ moo # Client-side - + .host.foo.com TRUE /we/want/ FALSE 2147483647 test no - + .host.foo.com TRUE /we/want/ FALSE 2147483647 tester yes @@ -50,7 +50,7 @@ HTTP cookie with Max-Age=0 TZ=GMT -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/jar%TESTNUMBER.txt -b log/jar%TESTNUMBER-2.txt -H "Host: host.foo.com" http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002 +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b %LOGDIR/jar%TESTNUMBER.txt -b %LOGDIR/jar%TESTNUMBER-2.txt -H "Host: host.foo.com" http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER0002 cookies diff --git a/tests/data/test33 b/tests/data/test33 index 56024842cc..bd02e00885 100644 --- a/tests/data/test33 +++ b/tests/data/test33 @@ -23,7 +23,7 @@ http HTTP PUT with resume - + 012345678 012345678 012345678 @@ -36,7 +36,7 @@ HTTP PUT with resume 012345678 -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Tlog/test%TESTNUMBER.txt -C 50 +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T%LOGDIR/test%TESTNUMBER.txt -C 50 diff --git a/tests/data/test339 b/tests/data/test339 index 8d5b90bdbd..8c43402757 100644 --- a/tests/data/test339 +++ b/tests/data/test339 @@ -39,7 +39,7 @@ http Check if --etag-save saved correct etag to a file -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save log/etag%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER @@ -53,7 +53,7 @@ User-Agent: curl/%VERSION Accept: */* - + W/"asdf" diff --git a/tests/data/test341 b/tests/data/test341 index 3c9f72ae5f..4ebee11fcc 100644 --- a/tests/data/test341 +++ b/tests/data/test341 @@ -39,7 +39,7 @@ http Try to open a non existing file with --etag-compare should return an error -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER diff --git a/tests/data/test342 b/tests/data/test342 index ca8957a5f0..79f6025635 100644 --- a/tests/data/test342 +++ b/tests/data/test342 @@ -33,11 +33,11 @@ http Check if --etag-compare set correct etag in header - + "21025-dc7-39462498" -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER diff --git a/tests/data/test343 b/tests/data/test343 index faf6c9a5ed..dd13708ce8 100644 --- a/tests/data/test343 +++ b/tests/data/test343 @@ -33,11 +33,11 @@ http Both --etag-compare and --etag-save to save new Etag - + "21025-dc7-39462498" -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER --etag-save log/out%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --etag-save %LOGDIR/out%TESTNUMBER @@ -52,7 +52,7 @@ Accept: */* If-None-Match: "21025-dc7-39462498" - + "21025-dc7-11111" diff --git a/tests/data/test344 b/tests/data/test344 index ec671d4920..197c00489b 100644 --- a/tests/data/test344 +++ b/tests/data/test344 @@ -34,7 +34,7 @@ http Both --etag-compare and -save store new Etag using non-existing file -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER --etag-save log/etag%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER @@ -49,7 +49,7 @@ Accept: */* If-None-Match: "" - + "21025-dc7-11111" diff --git a/tests/data/test345 b/tests/data/test345 index 5619d4475a..c6da676a83 100644 --- a/tests/data/test345 +++ b/tests/data/test345 @@ -33,11 +33,11 @@ http Both --etag-compare and -save store new Etag using one pre-existing file - + "21025-dc7-39462498" -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER --etag-save log/etag%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER @@ -52,7 +52,7 @@ Accept: */* If-None-Match: "21025-dc7-39462498" - + "21025-dc7-11111" diff --git a/tests/data/test347 b/tests/data/test347 index ef85d9d2c0..606335c0d0 100644 --- a/tests/data/test347 +++ b/tests/data/test347 @@ -39,7 +39,7 @@ http --etag-save with blank incoming header -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save log/etag%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER @@ -53,7 +53,7 @@ User-Agent: curl/%VERSION Accept: */* - + diff --git a/tests/data/test348 b/tests/data/test348 index 8832a38104..c9aa2cec49 100644 --- a/tests/data/test348 +++ b/tests/data/test348 @@ -21,7 +21,7 @@ ftp FTP upload file with 552 disk full response - + data to see @@ -30,7 +30,7 @@ works so does it? -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test35 b/tests/data/test35 index b5feb19984..33e6eac73f 100644 Binary files a/tests/data/test35 and b/tests/data/test35 differ diff --git a/tests/data/test355 b/tests/data/test355 index 98e59079a2..8b32c92e78 100644 --- a/tests/data/test355 +++ b/tests/data/test355 @@ -36,7 +36,7 @@ load Alt-Svc from file and use http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "" - + h1 example.com 80 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0 diff --git a/tests/data/test356 b/tests/data/test356 index b1dd349884..2597f15e88 100644 --- a/tests/data/test356 +++ b/tests/data/test356 @@ -43,7 +43,7 @@ parse incoming Alt-Svc and save to file CURL_ALTSVC_HTTP="yeah" -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "log/altsvc-%TESTNUMBER" +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" @@ -62,7 +62,7 @@ Accept: */* # matches s/\"([^\"]*)\"/TIMESTAMP/ - + # Your alt-svc cache. https://curl.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 diff --git a/tests/data/test357 b/tests/data/test357 index 4c204f60ef..4a7e6dc401 100644 --- a/tests/data/test357 +++ b/tests/data/test357 @@ -51,10 +51,10 @@ http HTTP PUT with Expect: 100-continue and 417 response -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt # 1053700 x 'x', large enough to invoke the 100-continue behaviour - + %repeat[1053700 x x]% diff --git a/tests/data/test358 b/tests/data/test358 index 0f8a9801bb..47afc582cb 100644 --- a/tests/data/test358 +++ b/tests/data/test358 @@ -44,9 +44,9 @@ HTTPS GET translated by alt-svc lookup to HTTP/2 GET CURL_ALTSVC_HTTP="yeah" ---http2 --alt-svc "log/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" +--http2 --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPPORT/%TESTNUMBER" - + h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0 @@ -85,7 +85,7 @@ s/^server: nghttpx.*\r?\n// # matches s/\"2([^\"]*)\"/TIMESTAMP/ - + # Your alt-svc cache. https://curl.se/docs/alt-svc.html # This file was generated by libcurl! Edit at your own risk. h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT TIMESTAMP 0 0 diff --git a/tests/data/test359 b/tests/data/test359 index 0e684e39e5..9b466b7732 100644 --- a/tests/data/test359 +++ b/tests/data/test359 @@ -44,9 +44,9 @@ HTTPS GET translated by alt-svc lookup to HTTP/2 GET CURL_ALTSVC_HTTP="yeah" ---http2 --alt-svc "log/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER" +--http2 --alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER" "http://%HOSTIP:%HTTPSPORT/%TESTNUMBER" - + h2 %HOSTIP %HTTPSPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0 @@ -85,7 +85,7 @@ s/^server: nghttpx.*\r?\n// # matches s/\"2([^\"]*)\"/TIMESTAMP/ - + # Your alt-svc cache. https://curl.se/docs/alt-svc.html # This file was generated by libcurl! Edit at your own risk. h2 %HOSTIP %HTTPSPORT h2 %HOSTIP %HTTP2PORT TIMESTAMP 0 0 diff --git a/tests/data/test362 b/tests/data/test362 index ad852c224f..9007619310 100644 --- a/tests/data/test362 +++ b/tests/data/test362 @@ -15,7 +15,7 @@ ftp FTP resume upload file with nothing to start from - + data to see @@ -24,7 +24,7 @@ works so does it? -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt --continue-at - +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --continue-at - diff --git a/tests/data/test364 b/tests/data/test364 index a5c9265903..627bc3170b 100644 --- a/tests/data/test364 +++ b/tests/data/test364 @@ -28,9 +28,9 @@ https HTTPS PUT of small file --k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt +-k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt - + %repeat[200 x banana]% diff --git a/tests/data/test369 b/tests/data/test369 index e1e2b32da2..17a6b4480a 100644 --- a/tests/data/test369 +++ b/tests/data/test369 @@ -29,7 +29,7 @@ http --etag-save with bad path then working transfer -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save log/nowhere/etag%TESTNUMBER --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER --include --output log/curl%TESTNUMBER.out +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/nowhere/etag%TESTNUMBER --next http://%HOSTIP:%HTTPPORT/%TESTNUMBER --include --output %LOGDIR/curl%TESTNUMBER.out diff --git a/tests/data/test370 b/tests/data/test370 index 8a5af1e057..671e35f635 100644 --- a/tests/data/test370 +++ b/tests/data/test370 @@ -22,7 +22,7 @@ none --etag-save with bad path - no transfer -http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --etag-save log/nowhere/etag%TESTNUMBER +http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --etag-save %LOGDIR/nowhere/etag%TESTNUMBER diff --git a/tests/data/test371 b/tests/data/test371 index 3a44db575a..83ea5c73ba 100644 --- a/tests/data/test371 +++ b/tests/data/test371 @@ -35,7 +35,7 @@ http using more -o than URLs in the command line -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/dump -o log/dump2 --no-progress-meter +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/dump -o %LOGDIR/dump2 --no-progress-meter diff --git a/tests/data/test376 b/tests/data/test376 index 34924c7ec6..8d15ec0928 100644 --- a/tests/data/test376 +++ b/tests/data/test376 @@ -35,7 +35,7 @@ http --remove-on-error -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/save-%TESTNUMBER --remove-on-error +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save-%TESTNUMBER --remove-on-error @@ -58,7 +58,7 @@ Accept: */* # the file should be empty now - + diff --git a/tests/data/test378 b/tests/data/test378 index 650e7d4e17..ca908b7aa0 100644 --- a/tests/data/test378 +++ b/tests/data/test378 @@ -21,7 +21,7 @@ none Reject using -T and -d at once --T log/%TESTNUMBER -d input http://never-accessed +-T %LOGDIR/%TESTNUMBER -d input http://never-accessed diff --git a/tests/data/test379 b/tests/data/test379 index c7ffc17144..491d815c08 100644 --- a/tests/data/test379 +++ b/tests/data/test379 @@ -28,7 +28,7 @@ Funny-head: yesyes # # Client-side - + exists before command runs @@ -38,7 +38,7 @@ http --remove-on-error with --no-clobber and an added number -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/save --remove-on-error --no-clobber +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save --remove-on-error --no-clobber @@ -61,11 +61,11 @@ Accept: */* # this file should be untouched - + exists before command runs # the file should be empty now - + diff --git a/tests/data/test38 b/tests/data/test38 index 0558700d15..da352d75d6 100644 --- a/tests/data/test38 +++ b/tests/data/test38 @@ -28,9 +28,9 @@ http HTTP resume request without server supporting it -http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o log/fewl%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -C - --no-include -o %LOGDIR/fewl%TESTNUMBER.txt - + This text is here to simulate a partly downloaded file to resume download on. @@ -51,7 +51,7 @@ Accept: */* # the download target file must remain untouched - + This text is here to simulate a partly downloaded file to resume download on. diff --git a/tests/data/test380 b/tests/data/test380 index a1849c178d..bd0c69765c 100644 --- a/tests/data/test380 +++ b/tests/data/test380 @@ -38,9 +38,9 @@ pick netrc password based on user name in URL ---netrc --netrc-file log/netrc%TESTNUMBER ftp://mary@%HOSTIP:%FTPPORT/ +--netrc --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary@%HOSTIP:%FTPPORT/ - + # the following two lines were created while testing curl machine %HOSTIP login frankenstein password wrongone machine %HOSTIP login mary password yram diff --git a/tests/data/test381 b/tests/data/test381 index c44fa74bcc..902cc91d15 100644 --- a/tests/data/test381 +++ b/tests/data/test381 @@ -42,9 +42,9 @@ netrc-optional lets URL creds override netrc ---netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://mary:drfrank@%HOSTIP:%FTPPORT/ +--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary:drfrank@%HOSTIP:%FTPPORT/ - + # the following two lines were created while testing curl machine %HOSTIP login frankenstein password wrongone machine %HOSTIP login mary password yram diff --git a/tests/data/test39 b/tests/data/test39 index f48e639f8c..5bfb2265c8 100644 --- a/tests/data/test39 +++ b/tests/data/test39 @@ -29,10 +29,10 @@ http HTTP RFC1867-type formposting with filename= and type= -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2= # We create this file before the command is invoked! - + foo bar This is a bar foo bar diff --git a/tests/data/test390 b/tests/data/test390 index 80e8c2b708..83f1cec422 100644 --- a/tests/data/test390 +++ b/tests/data/test390 @@ -27,7 +27,7 @@ Content-Type: text/html # # Client-side - + %repeat[1000 x hellofile!]% @@ -38,7 +38,7 @@ ftp curl HTTP, FILE and FTP in parallel -http://%HOSTIP:%HTTPPORT/%TESTNUMBER file://localhost%FILE_PWD/log/test%TESTNUMBER.txt ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 --parallel -o log/%TESTNUMBER.a -o log/%TESTNUMBER.b -o log/%TESTNUMBER.c +http://%HOSTIP:%HTTPPORT/%TESTNUMBER file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt ftp://%HOSTIP:%FTPPORT/%TESTNUMBER0002 --parallel -o %LOGDIR/%TESTNUMBER.a -o %LOGDIR/%TESTNUMBER.b -o %LOGDIR/%TESTNUMBER.c diff --git a/tests/data/test399 b/tests/data/test399 index da4bae5fde..da4b3f7cf7 100644 --- a/tests/data/test399 +++ b/tests/data/test399 @@ -15,11 +15,11 @@ http 65536 bytes long host name in URL - + url = http://%repeat[65536 x a]%/399 --K log/input%TESTNUM +-K %LOGDIR/input%TESTNUM diff --git a/tests/data/test401 b/tests/data/test401 index ac4af97724..043b660e68 100644 --- a/tests/data/test401 +++ b/tests/data/test401 @@ -19,7 +19,7 @@ ftps FTPS PASV upload file - + data to see @@ -28,7 +28,7 @@ works so does it? --k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt +-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test408 b/tests/data/test408 index 2516fc3323..676ec9d81b 100644 --- a/tests/data/test408 +++ b/tests/data/test408 @@ -25,9 +25,9 @@ ftps FTPS PORT upload with CWD --k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/CWD/STOR/RETR/%TESTNUMBER -T log/upload%TESTNUMBER -P - +-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/CWD/STOR/RETR/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -P - - + Moooooooooooo upload this diff --git a/tests/data/test409 b/tests/data/test409 index ea6e795609..4160a11ab7 100644 --- a/tests/data/test409 +++ b/tests/data/test409 @@ -19,7 +19,7 @@ ftps FTPS PASV upload file - + data to see @@ -28,7 +28,7 @@ works so does it? --k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt +-k --ftp-ssl-control ftps://%HOSTIP:%FTPSPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt diff --git a/tests/data/test410 b/tests/data/test410 index 06999fbaa4..4fec0b731d 100644 --- a/tests/data/test410 +++ b/tests/data/test410 @@ -32,11 +32,11 @@ https HTTPS GET with very long request header # 14 characters repeated 3500 times makes 49000 bytes - + Long: %repeat[3500 x header content]% --k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -H @log/file%TESTNUMBER +-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -H @%LOGDIR/file%TESTNUMBER diff --git a/tests/data/test411 b/tests/data/test411 index 912f07c6c4..eb6fad1bc6 100644 --- a/tests/data/test411 +++ b/tests/data/test411 @@ -20,7 +20,7 @@ none -K with missing file causes error --K log/missing http://localhost +-K %LOGDIR/missing http://localhost @@ -28,7 +28,7 @@ none # Verify data after the test has been "shot" -curl: cannot read config from 'log/missing' +curl: cannot read config from '%LOGDIR/missing' curl: option -K: error encountered when reading a file %if manual curl: try 'curl --help' or 'curl --manual' for more information diff --git a/tests/data/test412 b/tests/data/test412 index 0dbc0cea28..3f740f1689 100644 --- a/tests/data/test412 +++ b/tests/data/test412 @@ -41,9 +41,9 @@ alt-svc using host name with trailing dot in URL CURL_ALTSVC_HTTP="yeah" ---alt-svc "log/altsvc-%TESTNUMBER" "http://whohoo.:12345/%TESTNUMBER" +--alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://whohoo.:12345/%TESTNUMBER" - + h1 whohoo 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0 diff --git a/tests/data/test413 b/tests/data/test413 index 975b3e37cb..cfb7a72976 100644 --- a/tests/data/test413 +++ b/tests/data/test413 @@ -41,9 +41,9 @@ alt-svc using host name with trailing dot on host from file CURL_ALTSVC_HTTP="yeah" ---alt-svc "log/altsvc-%TESTNUMBER" "http://whohoo:12345/%TESTNUMBER" +--alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://whohoo:12345/%TESTNUMBER" - + h1 whohoo. 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0 diff --git a/tests/data/test414 b/tests/data/test414 index 2211d0f40a..391ed0d06e 100644 --- a/tests/data/test414 +++ b/tests/data/test414 @@ -55,7 +55,7 @@ https HTTPS sec-cookie, HTTP redirect, same name cookie, redirect back -https://attack.invalid:%HTTPSPORT/a/b/%TESTNUMBER -k -c log/cookie%TESTNUMBER --resolve attack.invalid:%HTTPSPORT:%HOSTIP --resolve attack.invalid:%HTTPPORT:%HOSTIP -L +https://attack.invalid:%HTTPSPORT/a/b/%TESTNUMBER -k -c %LOGDIR/cookie%TESTNUMBER --resolve attack.invalid:%HTTPSPORT:%HOSTIP --resolve attack.invalid:%HTTPPORT:%HOSTIP -L diff --git a/tests/data/test420 b/tests/data/test420 index b7fe4edda1..b5c7cb96b9 100644 --- a/tests/data/test420 +++ b/tests/data/test420 @@ -37,9 +37,9 @@ http Setting cookies set with expried dates that were loaded from jar -http://%HOSTIP:%HTTPPORT/func_test/del_cookie -b log/cookie%TESTNUMBER -c log/save%TESTNUMBER +http://%HOSTIP:%HTTPPORT/func_test/del_cookie -b %LOGDIR/cookie%TESTNUMBER -c %LOGDIR/save%TESTNUMBER - + %HOSTIP FALSE /func_test FALSE 1709598616 mycookie6 991 #HttpOnly_%HOSTIP FALSE /func_test FALSE 1709598616 mycookie5 990 #HttpOnly_%HOSTIP FALSE /func_test FALSE 1709598616 mycookie4 950 @@ -64,7 +64,7 @@ Accept: */* Cookie: mycookie2=5900; mycookie=1200; mycookie3=900; mycookie4=950; mycookie5=990; mycookie6=991; mycookie1=4900 - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test430 b/tests/data/test430 index e3aae0bef9..3826f1556f 100644 --- a/tests/data/test430 +++ b/tests/data/test430 @@ -37,19 +37,19 @@ Content-Type: text/3 # # Client-side - + --next url = %HOSTIP:%HTTPPORT/%TESTNUMBER0001 header = "a: a" data = "a" - + --next url = %HOSTIP:%HTTPPORT/%TESTNUMBER0002 header = "b: b" data = "b" - + --next url = %HOSTIP:%HTTPPORT/%TESTNUMBER0003 header = "c: c" @@ -63,7 +63,7 @@ http Three -K uses with --next and --data in each --K log/config%TESTNUMBER-a -K log/config%TESTNUMBER-b -K log/config%TESTNUMBER-c +-K %LOGDIR/config%TESTNUMBER-a -K %LOGDIR/config%TESTNUMBER-b -K %LOGDIR/config%TESTNUMBER-c diff --git a/tests/data/test431 b/tests/data/test431 index bebe62017e..52c39d1bad 100644 --- a/tests/data/test431 +++ b/tests/data/test431 @@ -37,13 +37,13 @@ Content-Type: text/3 # # Client-side - + --next url = %HOSTIP:%HTTPPORT/%TESTNUMBER0001 header = "a: a" data = "a" - + --next url = %HOSTIP:%HTTPPORT/%TESTNUMBER0002 header = "b: b" @@ -57,7 +57,7 @@ http Two -K uses with --next and then one on cmdline --K log/config%TESTNUMBER-a -K log/config%TESTNUMBER-b --next -d c %HOSTIP:%HTTPPORT/%TESTNUMBER0003 -H "c: c" +-K %LOGDIR/config%TESTNUMBER-a -K %LOGDIR/config%TESTNUMBER-b --next -d c %HOSTIP:%HTTPPORT/%TESTNUMBER0003 -H "c: c" diff --git a/tests/data/test432 b/tests/data/test432 index e7fe45b374..fd056c3680 100644 --- a/tests/data/test432 +++ b/tests/data/test432 @@ -37,7 +37,7 @@ Content-Type: text/3 # # Client-side - + --next url = %HOSTIP:%HTTPPORT/%TESTNUMBER0001 header = "a: a" @@ -46,9 +46,9 @@ data = "a" url = %HOSTIP:%HTTPPORT/%TESTNUMBER0002 header = "b: b" data = "b" -config = "log/config%TESTNUMBER-c" +config = "%LOGDIR/config%TESTNUMBER-c" - + --next url = %HOSTIP:%HTTPPORT/%TESTNUMBER0003 header = "c: c" @@ -62,7 +62,7 @@ http Use -K with --next and --config from within --K log/config%TESTNUMBER +-K %LOGDIR/config%TESTNUMBER diff --git a/tests/data/test433 b/tests/data/test433 index 34ea4a79c4..e86f3deaeb 100644 --- a/tests/data/test433 +++ b/tests/data/test433 @@ -20,7 +20,7 @@ Content-Type: text/1 # # Client-side - + --next header = "a: a" data = "curlrc read" @@ -29,7 +29,7 @@ data = "curlrc read" http -XDG_CONFIG_HOME=%PWD/log +XDG_CONFIG_HOME=%PWD/%LOGDIR HOME= CURL_HOME= diff --git a/tests/data/test434 b/tests/data/test434 index d411b161b2..63d8ce7c6e 100644 --- a/tests/data/test434 +++ b/tests/data/test434 @@ -19,7 +19,7 @@ Content-Type: text/1 # - + url = %HOSTIP:%HTTPPORT/%TESTNUMBER @@ -29,7 +29,7 @@ http -K with a single line without newline --K log/config%TESTNUMBER +-K %LOGDIR/config%TESTNUMBER diff --git a/tests/data/test436 b/tests/data/test436 index 0a62cfb97f..d435b5110d 100644 --- a/tests/data/test436 +++ b/tests/data/test436 @@ -20,7 +20,7 @@ Content-Type: text/1 # # Client-side - + --next header = "a: a" data = "curlrc read" @@ -29,7 +29,7 @@ data = "curlrc read" http -CURL_HOME=%PWD/log +CURL_HOME=%PWD/%LOGDIR XDG_CONFIG_HOME= diff --git a/tests/data/test44 b/tests/data/test44 index 4f39bc1eb7..880c7aef78 100644 --- a/tests/data/test44 +++ b/tests/data/test44 @@ -30,10 +30,10 @@ http HTTP RFC1867-type formposting without Expect: header -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt -H "Expect:" +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt -H "Expect:" # We create this file before the command is invoked! - + foo- This is a moo- bar diff --git a/tests/data/test440 b/tests/data/test440 index 0986cda1a5..a77ef606d9 100644 --- a/tests/data/test440 +++ b/tests/data/test440 @@ -34,7 +34,7 @@ https # no trailing dot in the file only in the URL - + this.hsts.example "99991001 04:47:41" @@ -42,7 +42,7 @@ this.hsts.example "99991001 04:47:41" HSTS with trailing-dot host name in URL but none in hsts file --x http://%HOSTIP:%HTTPPORT http://this.hsts.example./%TESTNUMBER --hsts log/input%TESTNUMBER -w '%{url_effective}\n' +-x http://%HOSTIP:%HTTPPORT http://this.hsts.example./%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER -w '%{url_effective}\n' diff --git a/tests/data/test441 b/tests/data/test441 index 6fbf7be3bd..29b990b891 100644 --- a/tests/data/test441 +++ b/tests/data/test441 @@ -34,7 +34,7 @@ https # no trailing dot in the file only in the URL - + this.hsts.example. "99991001 04:47:41" @@ -42,7 +42,7 @@ this.hsts.example. "99991001 04:47:41" HSTS with no t-dot host name in URL but t-dot in file --x http://%HOSTIP:%HTTPPORT http://this.hsts.example/%TESTNUMBER --hsts log/input%TESTNUMBER -w '%{url_effective}\n' +-x http://%HOSTIP:%HTTPPORT http://this.hsts.example/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER -w '%{url_effective}\n' diff --git a/tests/data/test442 b/tests/data/test442 index cd750eddef..2787c02b6f 100644 --- a/tests/data/test442 +++ b/tests/data/test442 @@ -38,9 +38,9 @@ http Send capped huge number of matching cookies -http://attack.invalid:%HTTPPORT/a/b/%TESTNUMBER -b log/cookie%TESTNUMBER --resolve attack.invalid:%HTTPPORT:%HOSTIP -L +http://attack.invalid:%HTTPPORT/a/b/%TESTNUMBER -b %LOGDIR/cookie%TESTNUMBER --resolve attack.invalid:%HTTPPORT:%HOSTIP -L - + attack.invalid TRUE / FALSE 0 name1 could-be-large-1 attack.invalid TRUE / FALSE 0 name2 could-be-large-2 attack.invalid TRUE / FALSE 0 name3 could-be-large-3 diff --git a/tests/data/test443 b/tests/data/test443 index ea413b90c9..975d8fdaee 100644 --- a/tests/data/test443 +++ b/tests/data/test443 @@ -38,9 +38,9 @@ http Cookie header in request no longer than 8K -http://attack.invalid:%HTTPPORT/a/b/%TESTNUMBER -b log/cookie%TESTNUMBER --resolve attack.invalid:%HTTPPORT:%HOSTIP -L +http://attack.invalid:%HTTPPORT/a/b/%TESTNUMBER -b %LOGDIR/cookie%TESTNUMBER --resolve attack.invalid:%HTTPPORT:%HOSTIP -L - + attack.invalid TRUE / FALSE 0 huge-1 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-1 attack.invalid TRUE / FALSE 0 huge-2 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-2 attack.invalid TRUE / FALSE 0 huge-3 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa-3 diff --git a/tests/data/test444 b/tests/data/test444 index e1f87fe38d..8df990280a 100644 --- a/tests/data/test444 +++ b/tests/data/test444 @@ -116,7 +116,7 @@ http Many Set-Cookie response headers -http://attack.invalid:%HTTPPORT/a/b/%TESTNUMBER -c log/cookie%TESTNUMBER --resolve attack.invalid:%HTTPPORT:%HOSTIP +http://attack.invalid:%HTTPPORT/a/b/%TESTNUMBER -c %LOGDIR/cookie%TESTNUMBER --resolve attack.invalid:%HTTPPORT:%HOSTIP cookies @@ -133,7 +133,7 @@ User-Agent: curl/%VERSION Accept: */* - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test446 b/tests/data/test446 index 0e2dfdcfe3..b8e719dd77 100644 --- a/tests/data/test446 +++ b/tests/data/test446 @@ -52,7 +52,7 @@ CURL_TIME=2000000000 HSTS with two URLs --x http://%HOSTIP:%PROXYPORT --hsts log/hsts%TESTNUMBER http://this.hsts.example./%TESTNUMBER http://another.example.com/%TESTNUMBER0002 +-x http://%HOSTIP:%PROXYPORT --hsts %LOGDIR/hsts%TESTNUMBER http://this.hsts.example./%TESTNUMBER http://another.example.com/%TESTNUMBER0002 @@ -73,7 +73,7 @@ Proxy-Connection: Keep-Alive - + # Your HSTS cache. https://curl.se/docs/hsts.html # This file was generated by libcurl! Edit at your own risk. this.hsts.example "20330525 03:33:20" diff --git a/tests/data/test46 b/tests/data/test46 index 9e30c5278f..d36787d544 100644 --- a/tests/data/test46 +++ b/tests/data/test46 @@ -43,9 +43,9 @@ HTTP with bad domain name, get cookies and store in cookie jar TZ=GMT -domain..tld:%HTTPPORT/want/%TESTNUMBER --resolve domain..tld:%HTTPPORT:%HOSTIP -c log/jar%TESTNUMBER -b log/injar%TESTNUMBER +domain..tld:%HTTPPORT/want/%TESTNUMBER --resolve domain..tld:%HTTPPORT:%HOSTIP -c %LOGDIR/jar%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This is generated by libcurl! Do not edit. @@ -71,7 +71,7 @@ Accept: */* Cookie: empty=; mooo2=indeed2; mooo=indeed - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test490 b/tests/data/test490 index 3fcd0f3d50..e94ea0d2a1 100644 --- a/tests/data/test490 +++ b/tests/data/test490 @@ -35,9 +35,9 @@ http Two globbed HTTP PUTs -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{log/in%TESTNUMBER,log/in%TESTNUMBER}' +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{%LOGDIR/in%TESTNUMBER,%LOGDIR/in%TESTNUMBER}' - + surprise! diff --git a/tests/data/test491 b/tests/data/test491 index a2191ffe58..a3c93aa50c 100644 --- a/tests/data/test491 +++ b/tests/data/test491 @@ -35,9 +35,9 @@ http Two globbed HTTP PUTs, the second upload file is missing -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{log/in%TESTNUMBER,log/bad%TESTNUMBER}' +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{%LOGDIR/in%TESTNUMBER,%LOGDIR/bad%TESTNUMBER}' - + surprise! diff --git a/tests/data/test492 b/tests/data/test492 index 6c704000db..dcf18eb694 100644 --- a/tests/data/test492 +++ b/tests/data/test492 @@ -35,12 +35,12 @@ http Two globbed HTTP PUTs to two globbed URLs -'http://%HOSTIP:%HTTPPORT/{one,two}/' -T '{log/first%TESTNUMBER,log/second%TESTNUMBER}' -H "Testno: %TESTNUMBER" +'http://%HOSTIP:%HTTPPORT/{one,two}/' -T '{%LOGDIR/first%TESTNUMBER,%LOGDIR/second%TESTNUMBER}' -H "Testno: %TESTNUMBER" - + first %TESTNUMBER contents - + second %TESTNUMBER contents diff --git a/tests/data/test493 b/tests/data/test493 index f0c41105bd..1a677d3295 100644 --- a/tests/data/test493 +++ b/tests/data/test493 @@ -33,7 +33,7 @@ proxy https - + .hsts.example "99991001 04:47:41" @@ -41,7 +41,7 @@ https HSTS and %{url_effective} after upgrade --x http://%HOSTIP:%HTTPPORT http://this.hsts.example/%TESTNUMBER --hsts log/input%TESTNUMBER -w '%{url_effective}\n' +-x http://%HOSTIP:%HTTPPORT http://this.hsts.example/%TESTNUMBER --hsts %LOGDIR/input%TESTNUMBER -w '%{url_effective}\n' diff --git a/tests/data/test494 b/tests/data/test494 index 441744619a..78faab6a1d 100644 --- a/tests/data/test494 +++ b/tests/data/test494 @@ -25,9 +25,9 @@ ftp skip 'macdef' when parsing netrc ---netrc --netrc-file log/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNUMBER +--netrc --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNUMBER - + macdef testmacro bin diff --git a/tests/data/test500 b/tests/data/test500 index 514d0b9745..384de1b5de 100644 --- a/tests/data/test500 +++ b/tests/data/test500 @@ -38,14 +38,14 @@ lib500 simple libcurl HTTP GET tool -http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER # # Verify data after the test has been "shot" - + IP %HOSTIP diff --git a/tests/data/test502 b/tests/data/test502 index 11212572d6..4a6d60f132 100644 --- a/tests/data/test502 +++ b/tests/data/test502 @@ -30,9 +30,9 @@ lib%TESTNUMBER simple multi file:// get -file://%PWD/log/test%TESTNUMBER.txt +file://%PWD/%LOGDIR/test%TESTNUMBER.txt - + foo bar swsclose bar diff --git a/tests/data/test503 b/tests/data/test503 index 1ad7a552d1..11a58f4be6 100644 --- a/tests/data/test503 +++ b/tests/data/test503 @@ -59,7 +59,7 @@ simple multi http:// through proxytunnel with authentication info http://machine.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT - + foo bar bar diff --git a/tests/data/test505 b/tests/data/test505 index 13ddc62d73..03437063f9 100644 --- a/tests/data/test505 +++ b/tests/data/test505 @@ -23,9 +23,9 @@ lib%TESTNUMBER FTP upload with rename after transfer -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/upload%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/upload%TESTNUMBER - + Contents of a file diff --git a/tests/data/test506 b/tests/data/test506 index 44f3afd224..d6196ec025 100644 --- a/tests/data/test506 +++ b/tests/data/test506 @@ -233,7 +233,7 @@ lock: share [Pigs in space]: 98 unlock: share [Pigs in space]: 99 GLOBAL_CLEANUP - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test525 b/tests/data/test525 index ce37399fce..43e5728e97 100644 --- a/tests/data/test525 +++ b/tests/data/test525 @@ -26,9 +26,9 @@ lib%TESTNUMBER FTP PORT upload using multi interface -ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER - + Moooooooooooo upload this diff --git a/tests/data/test529 b/tests/data/test529 index 141166c028..9c2bc501b5 100644 --- a/tests/data/test529 +++ b/tests/data/test529 @@ -26,9 +26,9 @@ lib%TESTNUMBER FTP PORT upload using multi interface (weird cleanup function sequence) -ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER - + Moooooooooooo upload this diff --git a/tests/data/test53 b/tests/data/test53 index 4034a4c662..d5997f5a8e 100644 --- a/tests/data/test53 +++ b/tests/data/test53 @@ -29,9 +29,9 @@ http HTTP, junk session cookies -%HOSTIP:%HTTPPORT/want/%TESTNUMBER -b log/injar%TESTNUMBER -j +%HOSTIP:%HTTPPORT/want/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -j - + %HOSTIP FALSE / FALSE 2139150993 mooo indeed %HOSTIP FALSE / FALSE 0 moo1 indeed %HOSTIP FALSE / FALSE 1 moo2 indeed diff --git a/tests/data/test531 b/tests/data/test531 index 17ccf68e22..3463613ac8 100644 --- a/tests/data/test531 +++ b/tests/data/test531 @@ -29,9 +29,9 @@ lib525 FTP PORT upload using multi interface and get 425 response -ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER - + Moooooooooooo don't upload this diff --git a/tests/data/test541 b/tests/data/test541 index 2dc75f8a47..fbcfeb4d5e 100644 --- a/tests/data/test541 +++ b/tests/data/test541 @@ -23,9 +23,9 @@ lib%TESTNUMBER FTP upload and upload same file again without rewind -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/upload%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/upload%TESTNUMBER - + Contents of a file diff --git a/tests/data/test558 b/tests/data/test558 index 6df79887a5..06b772816e 100644 --- a/tests/data/test558 +++ b/tests/data/test558 @@ -35,7 +35,7 @@ nothing # # Verify data after the test has been "shot" - + MEM easy.c: malloc() MEM lib%TESTNUMBER.c: malloc() MEM lib%TESTNUMBER.c: free() diff --git a/tests/data/test566 b/tests/data/test566 index 09144f5d98..1fc3968ebb 100644 --- a/tests/data/test566 +++ b/tests/data/test566 @@ -37,14 +37,14 @@ lib%TESTNUMBER HTTP GET with CURLINFO_CONTENT_LENGTH_DOWNLOAD and 0 bytes transfer -http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER # # Verify data after the test has been "shot" - + CL 0 diff --git a/tests/data/test568 b/tests/data/test568 index 7dd23ca48a..7f7df731c1 100644 --- a/tests/data/test568 +++ b/tests/data/test568 @@ -61,7 +61,7 @@ RTSP Announce (PUT and POST style) test rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER # file written before test command runs - + v=0 o=mhandley 2890844526 2890845468 IN IP4 126.16.64.4 s=SDP Seminar diff --git a/tests/data/test569 b/tests/data/test569 index 043c2445d3..b70e9083ca 100644 --- a/tests/data/test569 +++ b/tests/data/test569 @@ -66,7 +66,7 @@ lib%TESTNUMBER RTSP Session ID parsing -rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER log/idfile%TESTNUMBER.txt +rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER %LOGDIR/idfile%TESTNUMBER.txt @@ -100,7 +100,7 @@ CSeq: 6 Session: A - + Got Session ID: [00.+1-am-aSe55ion_id\$yes-i-am\$] Got Session ID: [\$extraspaces] Got Session ID: [A] diff --git a/tests/data/test57 b/tests/data/test57 index f379d7488e..70b219d917 100644 --- a/tests/data/test57 +++ b/tests/data/test57 @@ -26,7 +26,7 @@ http HTTP content-type with spaces in --w "%{content_type}\n" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/out%TESTNUMBER +-w "%{content_type}\n" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/out%TESTNUMBER diff --git a/tests/data/test571 b/tests/data/test571 index e575343a6e..bae97d4180 100644 --- a/tests/data/test571 +++ b/tests/data/test571 @@ -86,7 +86,7 @@ lib%TESTNUMBER RTSP RTP Interleaving Test -rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER log/protofile%TESTNUMBER.txt +rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER %LOGDIR/protofile%TESTNUMBER.txt @@ -114,7 +114,7 @@ RTP PAYLOAD END CORRUPTED (11), [$] RTP: message size 63, channel 0 - + $99 diff --git a/tests/data/test572 b/tests/data/test572 index 0a470559bb..ff49988891 100644 --- a/tests/data/test572 +++ b/tests/data/test572 @@ -76,7 +76,7 @@ RTSP GET_PARAMETER (Put/Heartbeat/Post) rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER # file written before test command runs - + scale speed diff --git a/tests/data/test578 b/tests/data/test578 index 2ff8a1f1b0..9bce5818e5 100644 --- a/tests/data/test578 +++ b/tests/data/test578 @@ -38,14 +38,14 @@ lib%TESTNUMBER HTTP POST lower than MAX_INITIAL_POST_SIZE with progress callback -http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER # # Verify data after the test has been "shot" - + PASSED, UL data matched data size diff --git a/tests/data/test579 b/tests/data/test579 index e4b072bc23..3a532d811b 100644 --- a/tests/data/test579 +++ b/tests/data/test579 @@ -68,14 +68,14 @@ lib%TESTNUMBER small chunked HTTP POSTs with digest auth. and progress callback -http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER # # Verify data after the test has been "shot" - + Progress callback called with UL 0 out of 0 Progress callback called with UL 8 out of 0 Progress callback called with UL 16 out of 0 diff --git a/tests/data/test58 b/tests/data/test58 index 9322ecca7b..e68cca9262 100644 --- a/tests/data/test58 +++ b/tests/data/test58 @@ -26,9 +26,9 @@ http HTTP PUT from file with weird letters -http://%HOSTIP:%HTTPPORT/we/want/ -T log/%TESTNUMBERte[]st.txt -g +http://%HOSTIP:%HTTPPORT/we/want/ -T %LOGDIR/%TESTNUMBERte[]st.txt -g - + a few bytes diff --git a/tests/data/test582 b/tests/data/test582 index ddf17e3e39..86613e5fbf 100644 --- a/tests/data/test582 +++ b/tests/data/test582 @@ -24,9 +24,9 @@ lib%TESTNUMBER SFTP upload using multi interface -Sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload%TESTNUMBER.txt %PWD/log/file%TESTNUMBER.txt %USER: +Sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload%TESTNUMBER.txt %PWD/%LOGDIR/file%TESTNUMBER.txt %USER: - + Moooooooooooo upload this @@ -41,7 +41,7 @@ disable - + Moooooooooooo upload this diff --git a/tests/data/test583 b/tests/data/test583 index 029cdac327..4f6a91bc6e 100644 --- a/tests/data/test583 +++ b/tests/data/test583 @@ -29,7 +29,7 @@ SFTP with multi interface, remove handle early # name resolve will cause it to return rather quickly and thus we could trigger # the problem we're looking to verify. -sftp://localhost:%SSHPORT%SSH_PWD/log/upload%TESTNUMBER.txt %USER: +sftp://localhost:%SSHPORT%SSH_PWD/%LOGDIR/upload%TESTNUMBER.txt %USER: diff --git a/tests/data/test588 b/tests/data/test588 index 1eb262f5c6..d36bafee52 100644 --- a/tests/data/test588 +++ b/tests/data/test588 @@ -35,9 +35,9 @@ lib525 FTP PORT upload using multi interface, EPRT doesn't work -ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER - + Moooooooooooo upload this diff --git a/tests/data/test591 b/tests/data/test591 index 843ddb3973..528660145e 100644 --- a/tests/data/test591 +++ b/tests/data/test591 @@ -37,9 +37,9 @@ lib%TESTNUMBER FTP multi PORT and 425 on upload -ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER - + Moooooooooooo for %TESTNUMBER upload this diff --git a/tests/data/test592 b/tests/data/test592 index fc9f15d1de..e3a9147be7 100644 --- a/tests/data/test592 +++ b/tests/data/test592 @@ -37,9 +37,9 @@ lib591 FTP multi PORT and 421 on upload -ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER - + Moooooooooooo for %TESTNUMBER upload this diff --git a/tests/data/test593 b/tests/data/test593 index 47c1d94346..53a884a0fd 100644 --- a/tests/data/test593 +++ b/tests/data/test593 @@ -37,9 +37,9 @@ lib591 FTP multi PORT upload, no data conn and no transient neg. reply -ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER - + Moooooooooooo for %TESTNUMBER upload this diff --git a/tests/data/test594 b/tests/data/test594 index 8f5ba95b6a..dab35062b0 100644 --- a/tests/data/test594 +++ b/tests/data/test594 @@ -39,9 +39,9 @@ lib591 FTP multi PORT upload, no data conn and no positive prelim. reply -ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER - + Moooooooooooo for %TESTNUMBER upload this diff --git a/tests/data/test595 b/tests/data/test595 index 4d2f62b6de..f979746d70 100644 --- a/tests/data/test595 +++ b/tests/data/test595 @@ -36,7 +36,7 @@ lib585 verify close callbacks with passive FTP -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/ip%TESTNUMBER +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER diff --git a/tests/data/test596 b/tests/data/test596 index 64bd52b577..27d5d849ec 100644 --- a/tests/data/test596 +++ b/tests/data/test596 @@ -36,7 +36,7 @@ lib585 verify close callbacks with active FTP -ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/ip%TESTNUMBER activeftp +ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER activeftp diff --git a/tests/data/test599 b/tests/data/test599 index 5911b96efc..9ca266a3ea 100644 --- a/tests/data/test599 +++ b/tests/data/test599 @@ -72,14 +72,14 @@ lib%TESTNUMBER HTTP GET with progress callback and redirects changing content sizes -http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER # # Verify data after the test has been "shot" - + CL -1 diff --git a/tests/data/test600 b/tests/data/test600 index 88a6055c39..9ff12faf02 100644 --- a/tests/data/test600 +++ b/tests/data/test600 @@ -24,9 +24,9 @@ sftp SFTP retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - + Test data for ssh test diff --git a/tests/data/test601 b/tests/data/test601 index cadeeafe0d..6f995f19ed 100644 --- a/tests/data/test601 +++ b/tests/data/test601 @@ -24,9 +24,9 @@ scp SCP retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - + Test data for ssh test diff --git a/tests/data/test602 b/tests/data/test602 index 56d2747f22..bf6bc3f7ad 100644 --- a/tests/data/test602 +++ b/tests/data/test602 @@ -21,9 +21,9 @@ sftp SFTP put ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.%TESTNUMBER --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure - + Test data for ssh upload test diff --git a/tests/data/test603 b/tests/data/test603 index b873f1587e..530ed9ca69 100644 --- a/tests/data/test603 +++ b/tests/data/test603 @@ -21,9 +21,9 @@ scp SCP upload ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.%TESTNUMBER --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure - + Test data for ssh upload test diff --git a/tests/data/test608 b/tests/data/test608 index f919e9c737..f909506186 100644 --- a/tests/data/test608 +++ b/tests/data/test608 @@ -24,14 +24,14 @@ sftp SFTP post-quote rename ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/file%TESTNUMBER.txt %PWD/log/file%TESTNUMBER-renamed.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/%LOGDIR/file%TESTNUMBER.txt %PWD/%LOGDIR/file%TESTNUMBER-renamed.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure # Verify that the file was renamed properly, then rename the file back to what # it was so the verify section works and the file can be cleaned up. -perl %SRCDIR/libtest/test610.pl gone %PWD/log/file%TESTNUMBER.txt move %PWD/log/file%TESTNUMBER-renamed.txt %PWD/log/file%TESTNUMBER.txt +perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/file%TESTNUMBER.txt move %PWD/%LOGDIR/file%TESTNUMBER-renamed.txt %PWD/%LOGDIR/file%TESTNUMBER.txt - + Test file for rename test @@ -39,7 +39,7 @@ Test file for rename test # # Verify data after the test has been "shot" - + Test file for rename test diff --git a/tests/data/test609 b/tests/data/test609 index 66057d2556..bf1eff08fe 100644 --- a/tests/data/test609 +++ b/tests/data/test609 @@ -25,9 +25,9 @@ sftp SFTP post-quote mkdir failure ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-mkdir %PWD/log/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-mkdir %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - + Test file for mkdir test diff --git a/tests/data/test61 b/tests/data/test61 index 98c56498f2..b1f53b1e30 100644 --- a/tests/data/test61 +++ b/tests/data/test61 @@ -45,7 +45,7 @@ HTTP with various cookies and custom Host: TZ=GMT -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c log/jar%TESTNUMBER.txt -H "Host: www.host.foo.com" +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.host.foo.com" cookies @@ -61,7 +61,7 @@ User-Agent: curl/%VERSION Accept: */* - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test610 b/tests/data/test610 index d9eb2e6be4..a6d8a2354b 100644 --- a/tests/data/test610 +++ b/tests/data/test610 @@ -21,18 +21,18 @@ Dummy test file for rmdir test sftp -perl %SRCDIR/libtest/test%TESTNUMBER.pl mkdir %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test%TESTNUMBER.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir SFTP post-quote rmdir ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rmdir %PWD/log/test%TESTNUMBER.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure -perl %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/%LOGDIR/test%TESTNUMBER.dir - + Dummy test file for rmdir test diff --git a/tests/data/test611 b/tests/data/test611 index ee2a185b13..14fa4f18b7 100644 --- a/tests/data/test611 +++ b/tests/data/test611 @@ -21,18 +21,18 @@ Dummy test file for rename test sftp -perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir SFTP post-quote rename ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/log/test%TESTNUMBER.dir %PWD/log/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure -perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.new +perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new - + Dummy test file for rename test diff --git a/tests/data/test612 b/tests/data/test612 index 1d6fadec8c..04890c6c7e 100644 --- a/tests/data/test612 +++ b/tests/data/test612 @@ -24,12 +24,12 @@ sftp SFTP post-quote remove file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt -Q "-rm %PWD/log/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/upload.%TESTNUMBER --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt -Q "-rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/upload.%TESTNUMBER --insecure -perl %SRCDIR/libtest/test610.pl gone %PWD/log/test%TESTNUMBER.txt +perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt - + Dummy test file for remove test diff --git a/tests/data/test613 b/tests/data/test613 index d02e3bbecd..9bf30ad0d5 100644 --- a/tests/data/test613 +++ b/tests/data/test613 @@ -23,16 +23,16 @@ d????????? N U U N ??? N NN:NN asubdir sftp -perl %SRCDIR/libtest/test%TESTNUMBER.pl prepare %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test%TESTNUMBER.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir SFTP directory retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/ --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure -perl %SRCDIR/libtest/test%TESTNUMBER.pl postprocess %PWD/log/test%TESTNUMBER.dir %PWD/log/curl%TESTNUMBER.out +perl %SRCDIR/libtest/test%TESTNUMBER.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out diff --git a/tests/data/test614 b/tests/data/test614 index c0af2630a6..90e2e48035 100644 --- a/tests/data/test614 +++ b/tests/data/test614 @@ -24,16 +24,16 @@ d????????? N U U N ??? N NN:NN asubdir sftp -perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir SFTP pre-quote chmod ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/log/test%TESTNUMBER.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/ --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "chmod 444 %PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/ --insecure -perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir %PWD/log/curl%TESTNUMBER.out +perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/curl%TESTNUMBER.out diff --git a/tests/data/test615 b/tests/data/test615 index 09a825b035..529bb2c3e6 100644 --- a/tests/data/test615 +++ b/tests/data/test615 @@ -14,18 +14,18 @@ FAILURE sftp -perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir SFTP put remote failure ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/rofile.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/rofile.txt --insecure -perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir - + Test data for ssh upload test diff --git a/tests/data/test616 b/tests/data/test616 index ec03c31ba9..0feb69e1a9 100644 --- a/tests/data/test616 +++ b/tests/data/test616 @@ -23,9 +23,9 @@ sftp SFTP retrieval of empty file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - + diff --git a/tests/data/test617 b/tests/data/test617 index 3c067e3990..c72379869b 100644 --- a/tests/data/test617 +++ b/tests/data/test617 @@ -23,9 +23,9 @@ scp SCP retrieval of empty file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - + diff --git a/tests/data/test618 b/tests/data/test618 index f5e2c7b33d..5c083ac660 100644 --- a/tests/data/test618 +++ b/tests/data/test618 @@ -15,9 +15,9 @@ sftp SFTP retrieval of two files ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - + Test data for ssh test diff --git a/tests/data/test619 b/tests/data/test619 index 0f86d8a54a..5dcebfd823 100644 --- a/tests/data/test619 +++ b/tests/data/test619 @@ -15,9 +15,9 @@ scp SCP retrieval of two files ---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - + Test data for ssh test diff --git a/tests/data/test62 b/tests/data/test62 index 08fbf8e5dd..0484e8c855 100644 --- a/tests/data/test62 +++ b/tests/data/test62 @@ -29,9 +29,9 @@ http HTTP, send cookies when using custom Host: -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?hoge=fuga -b log/jar%TESTNUMBER.txt -H "Host: www.host.foo.com" +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER?hoge=fuga -b %LOGDIR/jar%TESTNUMBER.txt -H "Host: www.host.foo.com" - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test620 b/tests/data/test620 index fea44acf38..f33a4f0968 100644 --- a/tests/data/test620 +++ b/tests/data/test620 @@ -16,9 +16,9 @@ sftp SFTP retrieval of missing file followed by good file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/not-a-valid-file-moooo sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - + Test data for ssh test diff --git a/tests/data/test621 b/tests/data/test621 index 368baf6a0d..b564812622 100644 --- a/tests/data/test621 +++ b/tests/data/test621 @@ -16,9 +16,9 @@ scp SCP retrieval of missing file followed by good file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/not-a-valid-file-moooo scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/not-a-valid-file-moooo scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - + Test data for ssh test diff --git a/tests/data/test622 b/tests/data/test622 index c4f8508d34..02129f57fb 100644 --- a/tests/data/test622 +++ b/tests/data/test622 @@ -22,9 +22,9 @@ sftp SFTP put failure ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/nonexistent-directory/nonexistent-file --insecure - + Test data for ssh upload test diff --git a/tests/data/test623 b/tests/data/test623 index d1afb405f9..ca2ba17a31 100644 --- a/tests/data/test623 +++ b/tests/data/test623 @@ -22,9 +22,9 @@ scp SCP upload failure ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/log/nonexistent-directory/nonexistent-file --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/nonexistent-directory/nonexistent-file --insecure - + Test data for ssh upload test diff --git a/tests/data/test624 b/tests/data/test624 index 8daa93530e..5ef6f85326 100644 --- a/tests/data/test624 +++ b/tests/data/test624 @@ -22,12 +22,12 @@ sftp SFTP put with --ftp-create-dirs ---ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.dir/upload.%TESTNUMBER --insecure +--ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.dir/upload.%TESTNUMBER --insecure -perl %SRCDIR/libtest/test610.pl move %PWD/log/test%TESTNUMBER.dir/upload.%TESTNUMBER %PWD/log/upload.%TESTNUMBER rmdir %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test610.pl move %PWD/%LOGDIR/test%TESTNUMBER.dir/upload.%TESTNUMBER %PWD/%LOGDIR/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir - + Test data for ssh upload test diff --git a/tests/data/test625 b/tests/data/test625 index e6f0d77f0e..600a3e64db 100644 --- a/tests/data/test625 +++ b/tests/data/test625 @@ -22,12 +22,12 @@ sftp SFTP put with --ftp-create-dirs twice ---ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.a/upload.%TESTNUMBER -T log/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/test%TESTNUMBER.b/upload.%TESTNUMBER --insecure +--ftp-create-dirs --key curl_client_key --pubkey curl_client_key.pub -u %USER: -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.a/upload.%TESTNUMBER -T %LOGDIR/file%TESTNUMBER.txt sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/test%TESTNUMBER.b/upload.%TESTNUMBER --insecure -perl %SRCDIR/libtest/test610.pl move %PWD/log/test%TESTNUMBER.a/upload.%TESTNUMBER %PWD/log/upload.%TESTNUMBER rmdir %PWD/log/test%TESTNUMBER.a rm %PWD/log/test%TESTNUMBER.b/upload.%TESTNUMBER rmdir %PWD/log/test%TESTNUMBER.b +perl %SRCDIR/libtest/test610.pl move %PWD/%LOGDIR/test%TESTNUMBER.a/upload.%TESTNUMBER %PWD/%LOGDIR/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.a rm %PWD/%LOGDIR/test%TESTNUMBER.b/upload.%TESTNUMBER rmdir %PWD/%LOGDIR/test%TESTNUMBER.b - + Test data for ssh upload test diff --git a/tests/data/test626 b/tests/data/test626 index 0580f535b5..1cc1a68776 100644 --- a/tests/data/test626 +++ b/tests/data/test626 @@ -22,9 +22,9 @@ sftp SFTP invalid quote command ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "invalid-command foo bar" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "invalid-command foo bar" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - + Test file for rename test diff --git a/tests/data/test627 b/tests/data/test627 index 60b830e922..af9111a74e 100644 --- a/tests/data/test627 +++ b/tests/data/test627 @@ -24,12 +24,12 @@ sftp SFTP quote remove file with NOBODY ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -I -Q "rm %PWD/log/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -I -Q "rm %PWD/%LOGDIR/file%TESTNUMBER.txt" sftp://%HOSTIP:%SSHPORT --insecure -perl %SRCDIR/libtest/test610.pl gone %PWD/log/test%TESTNUMBER.txt +perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt - + Dummy test file for remove test diff --git a/tests/data/test630 b/tests/data/test630 index f678528b0e..f23e28085d 100644 --- a/tests/data/test630 +++ b/tests/data/test630 @@ -17,7 +17,7 @@ sftp SFTP incorrect host key ---hostpubmd5 00000000000000000000000000000000 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/irrelevant-file --insecure +--hostpubmd5 00000000000000000000000000000000 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/irrelevant-file --insecure diff --git a/tests/data/test631 b/tests/data/test631 index 720f3716ff..72a361fc89 100644 --- a/tests/data/test631 +++ b/tests/data/test631 @@ -17,7 +17,7 @@ scp SCP incorrect host key ---hostpubmd5 00000000000000000000000000000000 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/irrelevant-file --insecure +--hostpubmd5 00000000000000000000000000000000 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/irrelevant-file --insecure diff --git a/tests/data/test632 b/tests/data/test632 index 70cfe515af..57f4917fcc 100644 --- a/tests/data/test632 +++ b/tests/data/test632 @@ -20,7 +20,7 @@ sftp SFTP syntactically invalid host key ---hostpubmd5 00 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%NOLISTENPORT%SSH_PWD/log/irrelevant-file --insecure +--hostpubmd5 00 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%NOLISTENPORT%SSH_PWD/%LOGDIR/irrelevant-file --insecure diff --git a/tests/data/test633 b/tests/data/test633 index f9ad869f18..053fb7f7de 100644 --- a/tests/data/test633 +++ b/tests/data/test633 @@ -24,9 +24,9 @@ sftp SFTP retrieval with byte range ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 5-9 --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 5-9 --insecure - + Test data for ssh test diff --git a/tests/data/test634 b/tests/data/test634 index 9cf9320fec..32f5dafe57 100644 --- a/tests/data/test634 +++ b/tests/data/test634 @@ -25,9 +25,9 @@ sftp SFTP retrieval with byte range past end of file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 5-99 --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 5-99 --insecure - + Test data for ssh test diff --git a/tests/data/test635 b/tests/data/test635 index 5974ee8d3d..a8ad622cf4 100644 --- a/tests/data/test635 +++ b/tests/data/test635 @@ -24,9 +24,9 @@ sftp SFTP retrieval with byte range relative to end of file ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r -9 --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r -9 --insecure - + Test data for ssh test diff --git a/tests/data/test636 b/tests/data/test636 index 6bce35b907..0ad308cc18 100644 --- a/tests/data/test636 +++ b/tests/data/test636 @@ -25,9 +25,9 @@ sftp SFTP retrieval with X- byte range ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 5- --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 5- --insecure - + Test data for ssh test diff --git a/tests/data/test637 b/tests/data/test637 index 542506749b..98c513b314 100644 --- a/tests/data/test637 +++ b/tests/data/test637 @@ -23,9 +23,9 @@ sftp SFTP retrieval with invalid X- range ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt -r 99- --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt -r 99- --insecure - + Test data for ssh test diff --git a/tests/data/test638 b/tests/data/test638 index 85d59096fc..ecf89497e9 100644 --- a/tests/data/test638 +++ b/tests/data/test638 @@ -23,18 +23,18 @@ Dummy test file for rename test sftp -perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir SFTP post-quote rename * asterisk accept-fail ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test%TESTNUMBER.dir %PWD/log/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER.dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure -perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.new +perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new - + Dummy test file for rename test diff --git a/tests/data/test639 b/tests/data/test639 index e63cdf61f9..6df83af7b0 100644 --- a/tests/data/test639 +++ b/tests/data/test639 @@ -23,18 +23,18 @@ Dummy test file for rename test sftp -perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir SFTP post-quote rename * asterisk accept-fail ---key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/log/test%TESTNUMBER-not-exists-dir %PWD/log/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: -Q "-*rename %PWD/%LOGDIR/test%TESTNUMBER-not-exists-dir %PWD/%LOGDIR/test%TESTNUMBER.new" sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure -perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.dir +perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir - + Dummy test file for rename test diff --git a/tests/data/test640 b/tests/data/test640 index 2046dabd85..3b6e6b62b7 100644 --- a/tests/data/test640 +++ b/tests/data/test640 @@ -23,9 +23,9 @@ sftp SFTP --head retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure --head +--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure --head - + Test data for ssh test diff --git a/tests/data/test641 b/tests/data/test641 index df1788a0b7..91e8cdb4ea 100644 --- a/tests/data/test641 +++ b/tests/data/test641 @@ -23,9 +23,9 @@ scp SCP --head retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure --head +--key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure --head - + Test data for ssh test diff --git a/tests/data/test642 b/tests/data/test642 index 4fa5282c92..dfbbdbadad 100644 --- a/tests/data/test642 +++ b/tests/data/test642 @@ -24,9 +24,9 @@ sftp SFTP retrieval ---key curl_client_key --pubkey curl_client_key.pub -u %USER: --compressed-ssh sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt --insecure +--key curl_client_key --pubkey curl_client_key.pub -u %USER: --compressed-ssh sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt --insecure - + Test data for ssh test diff --git a/tests/data/test644 b/tests/data/test644 index c067d034c5..fc670756cb 100644 --- a/tests/data/test644 +++ b/tests/data/test644 @@ -58,7 +58,7 @@ CURL_FAKE_XATTR=1 --xattr with redirect -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -L -o log/out%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -L -o %LOGDIR/out%TESTNUMBER diff --git a/tests/data/test646 b/tests/data/test646 index 3418fa24c1..ef9191e75b 100644 --- a/tests/data/test646 +++ b/tests/data/test646 @@ -30,14 +30,14 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= This is the html version;headers=X-test1: this is a header;type=text/html;headers=X-test2: this is another header " -F "=This is the plain text version;headers=@log/headers%TESTNUMBER" -F "=)" -F "=@log/test%TESTNUMBER.txt;headers=" +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= This is the html version;headers=X-test1: this is a header;type=text/html;headers=X-test2: this is another header " -F "=This is the plain text version;headers=@%LOGDIR/headers%TESTNUMBER" -F "=)" -F "=@%LOGDIR/test%TESTNUMBER.txt;headers=<%LOGDIR/headers%TESTNUMBER" -H "From: different" -H "To: another" -H "Reply-To: " - + This is an attached file. It may contain any type of data. - + # This line is a comment X-fileheader1: This is a header from a file diff --git a/tests/data/test647 b/tests/data/test647 index 90d44c2c4b..1b0e15235d 100644 --- a/tests/data/test647 +++ b/tests/data/test647 @@ -25,9 +25,9 @@ imap IMAP APPEND multipart using mime API -imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -F "=(;type=multipart/alternative" -F "= This is the html version;type=text/html" -F "=This is the plain text version" -F "=)" -F "=@log/test%TESTNUMBER.txt" -H "Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)" -H "From: Fred Foobar " -H "To: joe@example.com" -H "Message-Id: " -H "Subject: afternoon meeting" -u user:secret +imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -F "=(;type=multipart/alternative" -F "= This is the html version;type=text/html" -F "=This is the plain text version" -F "=)" -F "=@%LOGDIR/test%TESTNUMBER.txt" -H "Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)" -H "From: Fred Foobar " -H "To: joe@example.com" -H "Message-Id: " -H "Subject: afternoon meeting" -u user:secret - + This is an attached file. It may contain any type of data. diff --git a/tests/data/test648 b/tests/data/test648 index fe32cd5ee9..3403e21004 100644 --- a/tests/data/test648 +++ b/tests/data/test648 @@ -30,9 +30,9 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is the email inline text with a very long line containing the special character = and that should be split by encoder.;headers=Content-disposition: "inline";encoder=quoted-printable' -F "=@log/test%TESTNUMBER.txt;encoder=base64" -H "From: different" -H "To: another" +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is the email inline text with a very long line containing the special character = and that should be split by encoder.;headers=Content-disposition: "inline";encoder=quoted-printable' -F "=@%LOGDIR/test%TESTNUMBER.txt;encoder=base64" -H "From: different" -H "To: another" - + This is an attached file. It may contain any type of data and will be encoded in base64 for transfer. diff --git a/tests/data/test649 b/tests/data/test649 index 668cdc75a0..eced79a860 100644 --- a/tests/data/test649 +++ b/tests/data/test649 @@ -30,9 +30,9 @@ To: another body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is valid;encoder=7bit' -F "=@log/test%TESTNUMBER.txt;encoder=7bit" -H "From: different" -H "To: another" +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F '=This is valid;encoder=7bit' -F "=@%LOGDIR/test%TESTNUMBER.txt;encoder=7bit" -H "From: different" -H "To: another" - + This is an attached file (in french: piÃ¨ce jointe). It contains at least an 8-bit byte value. diff --git a/tests/data/test650 b/tests/data/test650 index e2626b7523..c1dcd86438 100644 --- a/tests/data/test650 +++ b/tests/data/test650 @@ -41,9 +41,9 @@ HTTP formpost using form API Some data from stdin -http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/test%TESTNUMBER.filedata +http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/test%TESTNUMBER.filedata - + This is data from a file. diff --git a/tests/data/test651 b/tests/data/test651 index 38f21c3ad1..b58c224cb9 100644 --- a/tests/data/test651 +++ b/tests/data/test651 @@ -41,9 +41,9 @@ curl_formadd with huge COPYCONTENTS Some data from stdin -http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/test%TESTNUMBER.filedata +http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/test%TESTNUMBER.filedata - + This is data from a file. diff --git a/tests/data/test654 b/tests/data/test654 index 5716a0ba6b..f046f9e279 100644 --- a/tests/data/test654 +++ b/tests/data/test654 @@ -56,7 +56,7 @@ HTTP duplicate easy handle with mime data http://%HOSTIP:%HTTPPORT/%TESTNUMBER - + This is data from a file diff --git a/tests/data/test664 b/tests/data/test664 index 69a75df3f8..158d03cfad 100644 --- a/tests/data/test664 +++ b/tests/data/test664 @@ -24,9 +24,9 @@ sftp SFTP correct host key ---hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt +--hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt - + test diff --git a/tests/data/test665 b/tests/data/test665 index aa20bbfe19..f1fb76c7c9 100644 --- a/tests/data/test665 +++ b/tests/data/test665 @@ -24,9 +24,9 @@ scp SCP correct host key ---hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/log/file%TESTNUMBER.txt +--hostpubmd5 %SSHSRVMD5 --key curl_client_key --pubkey curl_client_key.pub -u %USER: scp://%HOSTIP:%SSHPORT%SSH_PWD/%LOGDIR/file%TESTNUMBER.txt - + test diff --git a/tests/data/test668 b/tests/data/test668 index c1a0f8f19f..984d2e0d28 100644 --- a/tests/data/test668 +++ b/tests/data/test668 @@ -49,7 +49,7 @@ HTTP mimepost early end of data detection http://%HOSTIP:%HTTPPORT/%TESTNUMBER - + This is data from a file diff --git a/tests/data/test676 b/tests/data/test676 index 1197ec5152..4ca312c1b6 100644 --- a/tests/data/test676 +++ b/tests/data/test676 @@ -44,7 +44,7 @@ Content-Type: text/html # Client-side - + %HOSTIP TRUE /we/want/ FALSE 2118138987 proven yes diff --git a/tests/data/test679 b/tests/data/test679 index 53b20c6e0b..d435ae0dbb 100644 --- a/tests/data/test679 +++ b/tests/data/test679 @@ -34,9 +34,9 @@ http netrc with quoted password ---netrc-optional --netrc-file log/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ +--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ - + machine %HOSTIP login user1 password "with spaces and \"\n\r\t\a" diff --git a/tests/data/test680 b/tests/data/test680 index 23e194daae..2cd0d47fe0 100644 --- a/tests/data/test680 +++ b/tests/data/test680 @@ -23,9 +23,9 @@ http netrc with quoted password but missing end quote ---netrc --netrc-file log/netrc%TESTNUMBER http://user1@http.example/ +--netrc --netrc-file %LOGDIR/netrc%TESTNUMBER http://user1@http.example/ - + machine %HOSTIP login user1 password "with spaces and \"\n\r\t\a diff --git a/tests/data/test682 b/tests/data/test682 index dfe076e5e7..0e3a789e65 100644 --- a/tests/data/test682 +++ b/tests/data/test682 @@ -30,9 +30,9 @@ http netrc with multiple logins - pick first ---netrc-optional --netrc-file log/netrc%TESTNUMBER http://user1@%HOSTIP:%HTTPPORT/ +--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user1@%HOSTIP:%HTTPPORT/ - + machine %HOSTIP login user1 password passwd1 machine %HOSTIP login user2 password passwd2 diff --git a/tests/data/test683 b/tests/data/test683 index cf6ea44733..4cbf5f077d 100644 --- a/tests/data/test683 +++ b/tests/data/test683 @@ -30,9 +30,9 @@ http netrc with multiple logins - pick second ---netrc-optional --netrc-file log/netrc%TESTNUMBER http://user2@%HOSTIP:%HTTPPORT/ +--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user2@%HOSTIP:%HTTPPORT/ - + machine %HOSTIP login user1 password passwd1 machine %HOSTIP login user2 password passwd2 diff --git a/tests/data/test684 b/tests/data/test684 index d7391a1319..712ee3be07 100644 --- a/tests/data/test684 +++ b/tests/data/test684 @@ -30,9 +30,9 @@ http netrc with no login ---netrc-optional --netrc-file log/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ +--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/ - + machine %HOSTIP password 5up3r53cr37 diff --git a/tests/data/test685 b/tests/data/test685 index ba520bd542..9d64fe7884 100644 --- a/tests/data/test685 +++ b/tests/data/test685 @@ -30,9 +30,9 @@ http netrc with no login - provided user ---netrc-optional --netrc-file log/netrc%TESTNUMBER http://user@%HOSTIP:%HTTPPORT/ +--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user@%HOSTIP:%HTTPPORT/ - + machine %HOSTIP password 5up3r53cr37 diff --git a/tests/data/test7 b/tests/data/test7 index 06df71d3cf..b7487ffb70 100644 --- a/tests/data/test7 +++ b/tests/data/test7 @@ -32,7 +32,7 @@ http HTTP with cookie parser and header recording -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -D log/heads%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b none -D %LOGDIR/heads%TESTNUMBER.txt @@ -45,7 +45,7 @@ User-Agent: curl/%VERSION Accept: */* - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test71 b/tests/data/test71 index 56c36e1b61..a5b6db6e98 100644 --- a/tests/data/test71 +++ b/tests/data/test71 @@ -33,14 +33,14 @@ HTTP and -F upload in config file -F name=daniel -F tool=curl --F file=@log/test%TESTNUMBER.txt +-F file=@%LOGDIR/test%TESTNUMBER.txt user-agent = "" http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -K - # We create this file before the command is invoked! - + foo- This is a moo- bar diff --git a/tests/data/test73 b/tests/data/test73 index 4248db525e..c5c2c009a0 100644 --- a/tests/data/test73 +++ b/tests/data/test73 @@ -29,7 +29,7 @@ http HTTP, receive cookies when using custom Host:, domain using only two dots -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c log/jar%TESTNUMBER.txt -H "Host: host.NOT_DISCLOSED.se" +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -c %LOGDIR/jar%TESTNUMBER.txt -H "Host: host.NOT_DISCLOSED.se" cookies @@ -45,7 +45,7 @@ User-Agent: curl/%VERSION Accept: */* - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test74 b/tests/data/test74 index 524a70eb8c..a2ecdd98bb 100644 --- a/tests/data/test74 +++ b/tests/data/test74 @@ -43,7 +43,7 @@ http HTTP, urlglob {}-retrieval and -o #[num] usage -"http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0001}" -o "log/dumpit#1.dump" +"http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0001}" -o "%LOGDIR/dumpit#1.dump" @@ -62,7 +62,7 @@ User-Agent: curl/%VERSION Accept: */* - + HTTP/1.0 200 OK Content-Type: text/html Funny-head: swsclose diff --git a/tests/data/test75 b/tests/data/test75 index 7bee044435..b11295c991 100644 --- a/tests/data/test75 +++ b/tests/data/test75 @@ -25,7 +25,7 @@ http HTTP, urlglob retrieval with bad range -"http://a-site-never-accessed.example.org/[2-1]" -o "log/weee#1.dump" --stderr - +"http://a-site-never-accessed.example.org/[2-1]" -o "%LOGDIR/weee#1.dump" --stderr - diff --git a/tests/data/test8 b/tests/data/test8 index 93f2a99459..7d087f337d 100644 --- a/tests/data/test8 +++ b/tests/data/test8 @@ -25,11 +25,11 @@ http HTTP with cookie parsing from header file -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/heads%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b %LOGDIR/heads%TESTNUMBER.txt # We create this file before the command is invoked! - + HTTP/1.1 200 OK Date: Tue, 09 Nov 2010 14:49:00 GMT Server: test-server/fake diff --git a/tests/data/test805 b/tests/data/test805 index 5ce64a791a..07fb97cfa5 100644 --- a/tests/data/test805 +++ b/tests/data/test805 @@ -23,9 +23,9 @@ imap IMAP APPEND message -imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -u user:secret +imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret - + Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST) From: Fred Foobar Subject: afternoon meeting diff --git a/tests/data/test86 b/tests/data/test86 index 5d4399c715..62284e942f 100644 --- a/tests/data/test86 +++ b/tests/data/test86 @@ -57,7 +57,7 @@ http HTTP, urlglob []-retrieval and -o #[num] usage -"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0003]" -o "log/dumpit#1.dump" +"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0003]" -o "%LOGDIR/dumpit#1.dump" @@ -83,7 +83,7 @@ Accept: */* # we check the second file - + HTTP/1.0 200 OK Content-Type: text/html Funny-head: swsclose diff --git a/tests/data/test87 b/tests/data/test87 index ff702dc470..5cf7de5a73 100644 --- a/tests/data/test87 +++ b/tests/data/test87 @@ -40,7 +40,7 @@ http urlglob with out of range -o #[num] usage -"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0002]" -o "log/dumpit%TESTNUMBER-#2.dump" +"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0002]" -o "%LOGDIR/dumpit%TESTNUMBER-#2.dump" @@ -50,7 +50,7 @@ urlglob with out of range -o #[num] usage # survives # - + HTTP/1.1 200 OK Funny-head: yesyes Content-Length: 16 diff --git a/tests/data/test88 b/tests/data/test88 index 842031a858..1ca5d88775 100644 --- a/tests/data/test88 +++ b/tests/data/test88 @@ -63,9 +63,9 @@ crypto HTTP PUT with Digest authorization -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --digest +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --digest - + This is data we upload with PUT a second line line three diff --git a/tests/data/test897 b/tests/data/test897 index 1a537ea60b..5c4410cc33 100644 --- a/tests/data/test897 +++ b/tests/data/test897 @@ -31,7 +31,7 @@ imap IMAP and envelope meta data after body transfer -'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' -u user:secret -D log/head-%TESTNUMBER +'imap://%HOSTIP:%IMAPPORT/%TESTNUMBER/;MAILINDEX=123/;SECTION=1' -u user:secret -D %LOGDIR/head-%TESTNUMBER @@ -45,7 +45,7 @@ A003 SELECT %TESTNUMBER A004 FETCH 123 BODY[1] A005 LOGOUT - + _ _ ____ _ ___| | | | _ \| | / __| | | | |_) | | diff --git a/tests/data/test9 b/tests/data/test9 index fc53b70435..b37accbcc0 100644 --- a/tests/data/test9 +++ b/tests/data/test9 @@ -30,10 +30,10 @@ http HTTP RFC1867-type formposting -http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@log/test%TESTNUMBER.txt +http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl -F file=@%LOGDIR/test%TESTNUMBER.txt # We create this file before the command is invoked! - + foo- This is a moo- bar diff --git a/tests/data/test909 b/tests/data/test909 index d50ab81317..6fa4b28d80 100644 --- a/tests/data/test909 +++ b/tests/data/test909 @@ -19,14 +19,14 @@ smtp SMTP without SIZE support - + From: different To: another body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml diff --git a/tests/data/test912 b/tests/data/test912 index 4a3f6d16f2..dd34a46ea5 100644 --- a/tests/data/test912 +++ b/tests/data/test912 @@ -23,14 +23,14 @@ smtp SMTP with SIZE support - + From: different To: another body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml diff --git a/tests/data/test913 b/tests/data/test913 index 9c19eb2dc9..48beac64ce 100644 --- a/tests/data/test913 +++ b/tests/data/test913 @@ -23,14 +23,14 @@ smtp SMTP with large message SIZE - + From: different To: another body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/test%TESTNUMBER.eml +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/test%TESTNUMBER.eml diff --git a/tests/data/test914 b/tests/data/test914 index ab895d2cd8..1843af9fe4 100644 --- a/tests/data/test914 +++ b/tests/data/test914 @@ -22,14 +22,14 @@ smtp SMTP invalid --mail-from - + From: different To: another body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from invalid -T log/test%TESTNUMBER.eml +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from invalid -T %LOGDIR/test%TESTNUMBER.eml diff --git a/tests/data/test938 b/tests/data/test938 index ec19998c02..0137b7a0cd 100644 --- a/tests/data/test938 +++ b/tests/data/test938 @@ -30,11 +30,11 @@ smtp SMTP multiple connection authentication - + mail body -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER001 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.one:secret -T log/upload%TESTNUMBER -: smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER002 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.two:secret -T log/upload%TESTNUMBER +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER001 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.one:secret -T %LOGDIR/upload%TESTNUMBER -: smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER002 --mail-rcpt recipient@example.com --mail-from sender@example.com -u user.two:secret -T %LOGDIR/upload%TESTNUMBER diff --git a/tests/data/test941 b/tests/data/test941 index f4dc34faea..a983837516 100644 --- a/tests/data/test941 +++ b/tests/data/test941 @@ -20,7 +20,7 @@ smtp SMTP with --crlf - + From: different To: another @@ -34,7 +34,7 @@ the --crlf option -smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T log/upload%TESTNUMBER --crlf +smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -T %LOGDIR/upload%TESTNUMBER --crlf diff --git a/tests/data/test96 b/tests/data/test96 index 27044bc996..2bf68cc4bf 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" - + MEM tool_paramhlp.c MEM tool_cfgable.c MEM tool_cfgable.c diff --git a/tests/data/test970 b/tests/data/test970 index 37945269a1..74c7cb3d6d 100644 --- a/tests/data/test970 +++ b/tests/data/test970 @@ -44,7 +44,7 @@ CURL_VERSION=curl-unit-test-fake-version HTTP GET with JSON output -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{json}' -o log/out%TESTNUMBER +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{json}' -o %LOGDIR/out%TESTNUMBER @@ -59,7 +59,7 @@ Accept: */* -{"certs":"","content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"log/out%TESTNUMBER","ftp_entry_path":null,"http_code":200,"http_connect":0,"http_version":"1.1","local_ip":"127.0.0.1","local_port":13,"method":"GET","num_certs":0,"num_connects":1,"num_headers":9,"num_redirects":0,"proxy_ssl_verify_result":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"HTTP","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_pretransfer":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"url":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","url_effective":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","urlnum":0,"curl_version":"curl-unit-test-fake-version"} +{"certs":"","content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"%LOGDIR/out%TESTNUMBER","ftp_entry_path":null,"http_code":200,"http_connect":0,"http_version":"1.1","local_ip":"127.0.0.1","local_port":13,"method":"GET","num_certs":0,"num_connects":1,"num_headers":9,"num_redirects":0,"proxy_ssl_verify_result":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"HTTP","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_pretransfer":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"url":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","url_effective":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","urlnum":0,"curl_version":"curl-unit-test-fake-version"} diff --git a/tests/data/test972 b/tests/data/test972 index b62eb5bde8..7ab134806a 100644 --- a/tests/data/test972 +++ b/tests/data/test972 @@ -45,7 +45,7 @@ CURL_VERSION=curl-unit-test-fake-version Verify JSON output -http://%HOSTIP:%HTTPPORT/%TESTNUMBER -s --write-out '%{json}\n' -o log/out972 +http://%HOSTIP:%HTTPPORT/%TESTNUMBER -s --write-out '%{json}\n' -o %LOGDIR/out972 @@ -60,7 +60,7 @@ Accept: */* -{"certs":"","content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"log/out972","ftp_entry_path":null,"http_code":200,"http_connect":0,"http_version":"1.1","local_ip":"%HOSTIP","local_port":13,"method":"GET","num_certs":0,"num_connects":1,"num_headers":9,"num_redirects":0,"proxy_ssl_verify_result":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"HTTP","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_pretransfer":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"url":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","url_effective":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","urlnum":0,"curl_version":"curl-unit-test-fake-version"} +{"certs":"","content_type":"text/html","errormsg":null,"exitcode":0,"filename_effective":"%LOGDIR/out972","ftp_entry_path":null,"http_code":200,"http_connect":0,"http_version":"1.1","local_ip":"%HOSTIP","local_port":13,"method":"GET","num_certs":0,"num_connects":1,"num_headers":9,"num_redirects":0,"proxy_ssl_verify_result":0,"redirect_url":null,"referer":null,"remote_ip":"%HOSTIP","remote_port":%HTTPPORT,"response_code":200,"scheme":"HTTP","size_download":445,"size_header":4019,"size_request":4019,"size_upload":0,"speed_download":13,"speed_upload":13,"ssl_verify_result":0,"time_appconnect":0.000013,"time_connect":0.000013,"time_namelookup":0.000013,"time_pretransfer":0.000013,"time_redirect":0.000013,"time_starttransfer":0.000013,"time_total":0.000013,"url":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","url_effective":"http://%HOSTIP:%HTTPPORT/%TESTNUMBER","urlnum":0,"curl_version":"curl-unit-test-fake-version"} diff --git a/tests/data/test977 b/tests/data/test977 index 65167ee0ee..145a81ba34 100644 --- a/tests/data/test977 +++ b/tests/data/test977 @@ -37,7 +37,7 @@ http URL with trailing dot and receiving a cookie for the TLD with dot --x http://%HOSTIP:%HTTPPORT http://firsthost.me. -c log/cookies%TESTNUMBER +-x http://%HOSTIP:%HTTPPORT http://firsthost.me. -c %LOGDIR/cookies%TESTNUMBER @@ -52,7 +52,7 @@ Accept: */* Proxy-Connection: Keep-Alive - + # Netscape HTTP Cookie File # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. diff --git a/tests/data/test978 b/tests/data/test978 index 105fa78c5f..16e55920d6 100644 --- a/tests/data/test978 +++ b/tests/data/test978 @@ -35,7 +35,7 @@ http verify that --stderr works for -w's stderr as well -http://%HOSTIP:%HTTPPORT/%TESTNUMBER --stderr log/redir --silent -w '%{stderr}nonsense\n' +http://%HOSTIP:%HTTPPORT/%TESTNUMBER --stderr %LOGDIR/redir --silent -w '%{stderr}nonsense\n' @@ -49,7 +49,7 @@ User-Agent: curl/%VERSION Accept: */* - + nonsense diff --git a/tests/data/test981 b/tests/data/test981 index 2b98ce42ad..e7941af532 100644 --- a/tests/data/test981 +++ b/tests/data/test981 @@ -29,9 +29,9 @@ imap IMAP STARTTLS pipelined server response -imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -u user:secret --ssl +imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret --ssl - + Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST) From: Fred Foobar Subject: afternoon meeting diff --git a/tests/data/test983 b/tests/data/test983 index 300ec459c9..203e40a3a7 100644 --- a/tests/data/test983 +++ b/tests/data/test983 @@ -26,7 +26,7 @@ ftp FTP STARTTLS pipelined server response - + data to see @@ -35,7 +35,7 @@ works so does it? ---ssl --ftp-ssl-control ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt -u user:secret -P %CLIENTIP +--ssl --ftp-ssl-control ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -u user:secret -P %CLIENTIP diff --git a/tests/data/test984 b/tests/data/test984 index e573f23c15..7887b776c3 100644 --- a/tests/data/test984 +++ b/tests/data/test984 @@ -27,9 +27,9 @@ imap IMAP require STARTTLS with failing capabilities -imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -u user:secret --ssl-reqd +imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret --ssl-reqd - + Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST) From: Fred Foobar Subject: afternoon meeting diff --git a/tests/data/test986 b/tests/data/test986 index a709437a49..ebe12c2914 100644 --- a/tests/data/test986 +++ b/tests/data/test986 @@ -26,7 +26,7 @@ ftp FTP require STARTTLS while preauthenticated - + data to see @@ -35,7 +35,7 @@ works so does it? ---ssl-reqd --ftp-ssl-control ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt -u user:secret +--ssl-reqd --ftp-ssl-control ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt -u user:secret diff --git a/tests/runtests.pl b/tests/runtests.pl index 5d2e590c25..f8387a7b73 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -156,6 +156,8 @@ my $LOGDIR="log"; my $TESTDIR="$srcdir/data"; my $LIBDIR="./libtest"; my $UNITDIR="./unit"; +# TODO: $LOGDIR could eventually change later on, so must regenerate all the +# paths depending on it after $LOGDIR itself changes. # TODO: change this to use server_inputfilename() my $SERVERIN="$LOGDIR/server.input"; # what curl sent the server my $SERVER2IN="$LOGDIR/server2.input"; # what curl sent the second server @@ -3332,6 +3334,7 @@ sub subVariables { # misc $$thing =~ s/${prefix}CURL/$CURL/g; + $$thing =~ s/${prefix}LOGDIR/$LOGDIR/g; $$thing =~ s/${prefix}PWD/$pwd/g; $$thing =~ s/${prefix}POSIX_PWD/$posix_pwd/g; $$thing =~ s/${prefix}VERSION/$CURLVERSION/g; @@ -3809,7 +3812,7 @@ sub singletest_preprocess { # Save a preprocessed version of the entire test file. This allows more # "basic" test case readers to enjoy variable replacements. my @entiretest = fulltest(); - my $otest = "log/test$testnum"; + my $otest = "$LOGDIR/test$testnum"; @entiretest = prepro($testnum, @entiretest); @@ -3821,7 +3824,7 @@ sub singletest_preprocess { close($fulltesth) || die "Failure writing test file"; # in case the process changed the file, reload it - loadtest("log/test${testnum}"); + loadtest("$LOGDIR/test${testnum}"); } @@ -3885,7 +3888,7 @@ sub singletest_precheck { $cmd = join(" ", @p); } - my @o = `$cmd 2>log/precheck-$testnum`; + my @o = `$cmd 2> $LOGDIR/precheck-$testnum`; if($o[0]) { $why = $o[0]; chomp $why; @@ -3970,8 +3973,8 @@ sub singletest_prepare { # cut off the file name part $path =~ s/^(.*)\/[^\/]*/$1/; my @parts = split(/\//, $path); - if($parts[0] eq "log") { - # the file is in log/ + if($parts[0] eq $LOGDIR) { + # the file is in $LOGDIR/ my $d = shift @parts; for(@parts) { $d .= "/$_"; @@ -4062,10 +4065,10 @@ sub singletest_run { $cmdargs = "$out$inc "; if($cmdhash{'option'} && ($cmdhash{'option'} =~ /binary-trace/)) { - $cmdargs .= "--trace log/trace$testnum "; + $cmdargs .= "--trace $LOGDIR/trace$testnum "; } else { - $cmdargs .= "--trace-ascii log/trace$testnum "; + $cmdargs .= "--trace-ascii $LOGDIR/trace$testnum "; } $cmdargs .= "--trace-time "; if($run_event_based) { @@ -6356,7 +6359,7 @@ foreach my $testnum (@at) { $failed.= "$testnum "; } if($postmortem) { - # display all files in log/ in a nice way + # display all files in $LOGDIR/ in a nice way displaylogs($testnum); } if($error==2) {