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 0447c8dbfff0a0cc7144494a901d8d54c57860b6..a9e2a7aaad071ae23e05604fb500b977bd875a25 100644 (file)
--- 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 1ecd40704381ca4bf64c4b3c1532240ef42d5f42..72ae5c18dbc99dd89aa58e11db93a549bac121e3 100644 (file)
--- 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.
 
-### `<file name="log/filename" [nonewline="yes"]>`
+### `<file name="%LOGDIR/filename" [nonewline="yes"]>`
 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.
 
-### `<file name="log/filename" [mode="text"]>`
+### `<file name="%LOGDIR/filename" [mode="text"]>`
 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 5dd9356cd463cf89a74e58b202b29b6dc2a54b29..b52850fa5032e191745c77f87e585655847f13d2 100644 (file)
--- a/tests/data/test10
+++ b/tests/data/test10
@@ -26,9 +26,9 @@ http
 simple HTTP PUT from file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 Weird
      file
          to

diff --git a/tests/data/test1001 b/tests/data/test1001
index 738afb27f91ff8264645ac2ea65cc1ffe67a7c84..8900a80a2325f41a94b1f36a726a9e84ee52a62c 100644 (file)
--- a/tests/data/test1001
+++ b/tests/data/test1001
@@ -72,9 +72,9 @@ proxy
 HTTP POST --digest with PUT and resumed upload and modified method
  </name>
  <command>
-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
 </command>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 test
 </file>
 </client>

diff --git a/tests/data/test1002 b/tests/data/test1002
index d929ae724c1953f383881b740273fad5c1f48a9b..3a098f10d364e5e83f6b33b6133eb257961270fe 100644 (file)
--- a/tests/data/test1002
+++ b/tests/data/test1002
@@ -71,9 +71,9 @@ proxy
 HTTP PUT with Digest auth, resumed upload and modified method, twice
  </name>
  <command>
-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
 </command>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 test
 </file>
 </client>

diff --git a/tests/data/test1007 b/tests/data/test1007
index c50e97d513e36c41a4b9129c198c7b97de67b25e..b6b64642874a3a732e0161bc95e3c61556ff98c7 100644 (file)
--- a/tests/data/test1007
+++ b/tests/data/test1007
@@ -17,9 +17,9 @@ tftp
 TFTP send with invalid permission on server
  </name>
  <command>
--T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//invalid-file
+-T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//invalid-file
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 This data will not be sent
 </file>
 </client>

diff --git a/tests/data/test1013 b/tests/data/test1013
index 17a3371f10f46b13859327218171eb5a56da8b33..70c6455e307914fa9cb3ee9bbcb8164925e3bf56 100644 (file)
--- a/tests/data/test1013
+++ b/tests/data/test1013
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --protocols
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config log/stdout%TESTNUMBER protocols
+%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER protocols
 </postcheck>
 </client>
 

diff --git a/tests/data/test1014 b/tests/data/test1014
index 875fa776208261e82086aefa1affbce9de13dc32..8dc3f0421ed6a62f1c2e7269108377bb824b7b1f 100644 (file)
--- a/tests/data/test1014
+++ b/tests/data/test1014
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --features
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1013.pl ../curl-config log/stdout%TESTNUMBER features
+%SRCDIR/libtest/test1013.pl ../curl-config %LOGDIR/stdout%TESTNUMBER features
 </postcheck>
 </client>
 

diff --git a/tests/data/test1015 b/tests/data/test1015
index 28412c2f79345673583a6eda19a118382481d384..c9971fcca53702b3919a1fecd39685461fb76856 100644 (file)
--- a/tests/data/test1015
+++ b/tests/data/test1015
@@ -28,9 +28,9 @@ http
 --data-urlencode
  </name>
  <command>
-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 
 </command>
-<file name="log/%TESTNUMBER.txt">
+<file name="%LOGDIR/%TESTNUMBER.txt">
 content to _?!#$'|<>
 </file>
 </client>

diff --git a/tests/data/test1016 b/tests/data/test1016
index 340dd969b4cc7231f9200cccddb4421ff11458fd..91ac2da380357eb139f59de426401250cf94a581 100644 (file)
--- a/tests/data/test1016
+++ b/tests/data/test1016
@@ -23,9 +23,9 @@ file
 X-Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 1-4 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
+-r 1-4 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt 
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>

diff --git a/tests/data/test1017 b/tests/data/test1017
index 034c87a7f7b921345fa0ad1e3ce0ecb2cc568220..59614b12f89c9003389e9c41742fe9b0c130993f 100644 (file)
--- a/tests/data/test1017
+++ b/tests/data/test1017
@@ -24,9 +24,9 @@ file
 0-Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 0-3 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
+-r 0-3 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt 
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>

diff --git a/tests/data/test1018 b/tests/data/test1018
index 25d8cb18072cd60e7229eb80824a498b49ddd57d..1fde0ca1a53e7f2ab6a70651da3dc852061f8b71 100644 (file)
--- a/tests/data/test1018
+++ b/tests/data/test1018
@@ -23,9 +23,9 @@ file
 X-X range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 4-4 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
+-r 4-4 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt 
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 1234567890
 </file>
 </client>

diff --git a/tests/data/test1019 b/tests/data/test1019
index 02732b4836d66e9e4ae07ed42aa2f30688084d05..87f88f5621ffebf2ba46a90d122d147e68716561 100644 (file)
--- a/tests/data/test1019
+++ b/tests/data/test1019
@@ -24,9 +24,9 @@ file
 X- range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 7- file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
+-r 7- file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt 
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>

diff --git a/tests/data/test1020 b/tests/data/test1020
index 91c9b638962f1155fea4b6557841ad385d7ca371..a17106e9d42fce5d168e972510c5e1ff730dea8a 100644 (file)
--- a/tests/data/test1020
+++ b/tests/data/test1020
@@ -24,9 +24,9 @@ file
 -Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r -9 file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
+-r -9 file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt 
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>

diff --git a/tests/data/test1022 b/tests/data/test1022
index e55b51ffe75a45a7e20c36704c7b6da3f423b727..2288e9b99acb8b486e62621e73be289dc999624c 100644 (file)
--- a/tests/data/test1022
+++ b/tests/data/test1022
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --version
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config log/stdout%TESTNUMBER version
+%SRCDIR/libtest/test%TESTNUMBER.pl ../curl-config %LOGDIR/stdout%TESTNUMBER version
 </postcheck>
 </client>
 

diff --git a/tests/data/test1023 b/tests/data/test1023
index 18071c6daec4cbf4242d1ec251212b226a9f0159..27a144db55358ad216f024066a865ed0fbf9c9c6 100644 (file)
--- a/tests/data/test1023
+++ b/tests/data/test1023
@@ -23,7 +23,7 @@ Compare curl --version with curl-config --vernum
 --version
 </command>
 <postcheck>
-%SRCDIR/libtest/test1022.pl ../curl-config log/stdout%TESTNUMBER vernum
+%SRCDIR/libtest/test1022.pl ../curl-config %LOGDIR/stdout%TESTNUMBER vernum
 </postcheck>
 </client>
 

diff --git a/tests/data/test1024 b/tests/data/test1024
index d8ceff10a3543ac1851f951458596e7b64ab7f39..fbd1db4223faa32faacd63e18a31bf5c65c5d6c2 100644 (file)
--- a/tests/data/test1024
+++ b/tests/data/test1024
@@ -75,7 +75,7 @@ http
 HTTP Location: following with cookies
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c log/jar%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -c %LOGDIR/jar%TESTNUMBER
 </command>
 <features>
 cookies

diff --git a/tests/data/test1025 b/tests/data/test1025
index ef0b33fb0dca3b132a1e78923cc64fdd91c1ce3a..039824c1aeee66f968bf664a461ca37856cc69e9 100644 (file)
--- a/tests/data/test1025
+++ b/tests/data/test1025
@@ -75,7 +75,7 @@ http
 HTTP Location: following with command-line and server cookies
  </name>
  <command>
-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
 </command>
 <features>
 cookies

diff --git a/tests/data/test1026 b/tests/data/test1026
index a702a1d6d0c6d2c2a570f5a6f506d541eba6b6fb..d240f91a9e3819f0ac79f95260fe18816aec7388 100644 (file)
--- 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.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(CONTRIBUTORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout%TESTNUMBER
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(curl\s*-\s*transfer\sa\s*URL)|(CONTRIBUTORS)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' %LOGDIR/stdout%TESTNUMBER
 </postcheck>
 </client>
 

diff --git a/tests/data/test1027 b/tests/data/test1027
index 7574203e2b66c607788b6efb46de72049cb58e52..6ce71b0cc7769b0effdaf67804761f1d1256a382 100644 (file)
--- 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.
 <postcheck>
-perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' log/stdout%TESTNUMBER
+perl -e 'open(IN,$ARGV[0]); my $lines=grep(/(Usage: curl )|(--version\s*Show version)/, <IN>); exit ($lines != 2); # Let this file pass an XML syntax check: </IN>' %LOGDIR/stdout%TESTNUMBER
 </postcheck>
 </client>
 

diff --git a/tests/data/test1030 b/tests/data/test1030
index 5824977023df87cf0f89e34d643fba5104372e79..c84033af3cce06f29a25b7b9de32f91633077ee5 100644 (file)
--- a/tests/data/test1030
+++ b/tests/data/test1030
@@ -67,9 +67,9 @@ crypto
 HTTP PUT with --anyauth authorization (picking Digest)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put%TESTNUMBER">
+<file name="%LOGDIR/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three

diff --git a/tests/data/test1036 b/tests/data/test1036
index 4ab61a27837d41b40725df60c21f9dee9d37df26..88183bc7df4a51448ad645f85278b8192318e87f 100644 (file)
--- a/tests/data/test1036
+++ b/tests/data/test1036
@@ -33,7 +33,7 @@ FTP download resume from end of file
  <command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl%TESTNUMBER.out">
+<file name="%LOGDIR/curl%TESTNUMBER.out">
 This is the start!!
 </file>
 </client>
@@ -52,7 +52,7 @@ REST 20
 RETR %TESTNUMBER\r
 QUIT\r
 </protocol>
-<file name="log/curl%TESTNUMBER.out">
+<file name="%LOGDIR/curl%TESTNUMBER.out">
 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 d9cacb2339ca53ddc38deaf2967f065a1e797f9d..6d3ede54ac6b2f721bc77dfefc9896b7fe450934 100644 (file)
--- a/tests/data/test1037
+++ b/tests/data/test1037
@@ -33,7 +33,7 @@ FTP download resume from end of empty file
  <command>
 ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl%TESTNUMBER.out">
+<file name="%LOGDIR/curl%TESTNUMBER.out">
 </file>
 </client>
 

diff --git a/tests/data/test1038 b/tests/data/test1038
index acac84a29b769070038991300c95b19e2c3e2a38..46fe821fa941da280a3697745bb12065c5577b98 100644 (file)
--- a/tests/data/test1038
+++ b/tests/data/test1038
@@ -23,9 +23,9 @@ ftp
 FTP PASV upload resume from end of file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C -
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 this is the *****cr@p******** that we're gonna upload
 
 worx?

diff --git a/tests/data/test1039 b/tests/data/test1039
index 53d7cb5cb4cf36e9454e1cb3dc6e313e3ce2ea0d..9f6d51306bb81ba49abbacb548e55a22a5079272 100644 (file)
--- a/tests/data/test1039
+++ b/tests/data/test1039
@@ -23,9 +23,9 @@ ftp
 FTP PASV upload resume from end of empty file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C -
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 this is the *****cr@p******** that we're gonna upload
 
 worx?

diff --git a/tests/data/test1040 b/tests/data/test1040
index 8899c5b06194fdd614577e38b568f34e2b1ec453..21410c6e97cebfa6d2c1fb6243f38c83ae69fceb 100644 (file)
--- a/tests/data/test1040
+++ b/tests/data/test1040
@@ -49,7 +49,7 @@ HTTP GET with resume from end of entirely-downloaded file
  <command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl%TESTNUMBER.out">
+<file name="%LOGDIR/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678

diff --git a/tests/data/test1041 b/tests/data/test1041
index 6c3c01cbcf32a47c2a1b88f44cee696342fcfc89..4e23e2cb6cdd8c6de801d660c882d555a7a0bcbc 100644 (file)
--- a/tests/data/test1041
+++ b/tests/data/test1041
@@ -31,7 +31,7 @@ http
  <name>
 HTTP PUT with resume from end of already-uploaded file
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 012345678
 012345678
 012345678
@@ -44,7 +44,7 @@ HTTP PUT with resume from end of already-uploaded file
 012345678
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Tlog/test%TESTNUMBER.txt -C -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T%LOGDIR/test%TESTNUMBER.txt -C -
 </command>
 </client>
 

diff --git a/tests/data/test1042 b/tests/data/test1042
index 4a33ae826d5d51485f6d0e7eeb6f27a138788fe6..f05c873639df4d204c1f9ab88bb76e544353e28a 100644 (file)
--- a/tests/data/test1042
+++ b/tests/data/test1042
@@ -61,7 +61,7 @@ HTTP GET beyond end of entirely-downloaded file, no server resume
  <command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 200
 </command>
-<file name="log/curl%TESTNUMBER.out">
+<file name="%LOGDIR/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678

diff --git a/tests/data/test1043 b/tests/data/test1043
index c728b9688832c1b06317f7a4e5a29ad4a710e95a..310256f65b560c11f676eb25c8b8fd6f2a21fcb1 100644 (file)
--- a/tests/data/test1043
+++ b/tests/data/test1043
@@ -60,7 +60,7 @@ HTTP GET with resume from end of file
  <command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C -
 </command>
-<file name="log/curl%TESTNUMBER.out">
+<file name="%LOGDIR/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678

diff --git a/tests/data/test1051 b/tests/data/test1051
index 9c082067b0ffc300210e9d9604589e18fd663b9f..fab1dbf9571f869a72dbdd2a009908ff3ed25dd9 100644 (file)
--- a/tests/data/test1051
+++ b/tests/data/test1051
@@ -56,9 +56,9 @@ http
 HTTP PUT with Location: following
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -T log/test%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -L -T %LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 Weird
      file
          to

diff --git a/tests/data/test1052 b/tests/data/test1052
index 8f8ee61bc3d2ed31087dd552c6f3cfe4a072a5b0..0ae56d033aa739e74b58cf083b8ee649b285a6f1 100644 (file)
--- a/tests/data/test1052
+++ b/tests/data/test1052
@@ -52,9 +52,9 @@ http
 HTTP 1.0 PUT with Location: following
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -0 -L -T log/test%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/want/%TESTNUMBER -0 -L -T %LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 Weird
      file
          to

diff --git a/tests/data/test1053 b/tests/data/test1053
index 06abcf1fb6cc4e11ecd264671fdfec38f799861b..6211e0df43487476b011735ac93a79e8bfeec9e4 100644 (file)
--- a/tests/data/test1053
+++ b/tests/data/test1053
@@ -61,10 +61,10 @@ http
 HTTP RFC1867-type formposting from file with Location: following
  </name>
  <command>
-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
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar

diff --git a/tests/data/test1054 b/tests/data/test1054
index d8b1d452c0a744208079825fe720fb2f062a9db7..d972579b908583a268f64ffec06008eb83118bfd 100644 (file)
--- a/tests/data/test1054
+++ b/tests/data/test1054
@@ -47,11 +47,11 @@ http
  <name>
 HTTP POST from file with 301 redirect and --post301
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 field=data
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @log/test%TESTNUMBER.txt --post301
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -d @%LOGDIR/test%TESTNUMBER.txt --post301
 </command>
 </client>
 

diff --git a/tests/data/test1055 b/tests/data/test1055
index b27b35b81d0a310eae7f2f33f2204ee371f10885..937068028d4d8fade7ad14050765bfba12eddfd9 100644 (file)
--- a/tests/data/test1055
+++ b/tests/data/test1055
@@ -36,9 +36,9 @@ ftp
 HTTP PUT Location: redirect to FTP URL
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -T log/test%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -L -T %LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 Weird
      file
          to

diff --git a/tests/data/test1063 b/tests/data/test1063
index ca1ba14a8dd0dcdd99cb6691819ec5d78bd6050d..ae9922a70f7f2d1495c909b134aec70c0a9fb620 100644 (file)
--- 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
  <command>
--r 4294967303- file://localhost%FILE_PWD/log/test%TESTNUMBER.txt 
+-r 4294967303- file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt 
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 1234567890
 1234567890
 </file>

diff --git a/tests/data/test1064 b/tests/data/test1064
index 1f5b4526ff70218751c9b955385f37e39046ef9b..298486616b3cc894f9a2060ec022e941e0d29c60 100644 (file)
--- a/tests/data/test1064
+++ b/tests/data/test1064
@@ -35,9 +35,9 @@ http
 HTTP PUT twice
  </name>
  <command>
--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
 </command>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 test
 </file>
 </client>

diff --git a/tests/data/test1065 b/tests/data/test1065
index 02e9a85650a9d97e09c10c2082f8c9afc24d3a9e..bd4be888f6821e8a2467379cae9a15a622ecae05 100644 (file)
--- a/tests/data/test1065
+++ b/tests/data/test1065
@@ -36,9 +36,9 @@ http
 HTTP PUT with one file but two URLs
  </name>
  <command>
--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
 </command>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 test
 </file>
 </client>

diff --git a/tests/data/test107 b/tests/data/test107
index 911de45bdd242f661ac8f3d69aaca21caa229515..5feffac412f5a1f315c337dbeb768406c04fc636 100644 (file)
--- a/tests/data/test107
+++ b/tests/data/test107
@@ -15,7 +15,7 @@ ftp
  <name>
 FTP PASV upload file
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
       see
@@ -24,7 +24,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 </client>
 

diff --git a/tests/data/test1070 b/tests/data/test1070
index 3e4d37a52ecab7bd9e164263a4683e2fec1c3f7b..ce88a1f0487a4d97e105ae55a3c556be01bfb54e 100644 (file)
--- a/tests/data/test1070
+++ b/tests/data/test1070
@@ -32,9 +32,9 @@ http
 HTTP POST with server closing connection before (all) data is received
  </name>
  <command>
- -d @log/input%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Expect: 100-continue"
+ -d @%LOGDIR/input%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H "Expect: 100-continue"
 </command>
-<file name="log/input%TESTNUMBER">
+<file name="%LOGDIR/input%TESTNUMBER">
 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 9eee479705ea1e155abcfa695018c2f7a65ee00b..568471eafaccc84665862a9ca7ebd6d3888efd34 100644 (file)
--- a/tests/data/test1071
+++ b/tests/data/test1071
@@ -73,9 +73,9 @@ crypto
 Downgraded HTTP PUT to HTTP 1.0 with authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put%TESTNUMBER">
+<file name="%LOGDIR/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three

diff --git a/tests/data/test1075 b/tests/data/test1075
index d55468138f14ddeae68547bd260d82fdfdec4d38..2dac5bf98659de55dd025bc1f8d9be82b2f0110f 100644 (file)
--- a/tests/data/test1075
+++ b/tests/data/test1075
@@ -52,9 +52,9 @@ http
 HTTP PUT with --anyauth authorization (picking Basic)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put%TESTNUMBER">
+<file name="%LOGDIR/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three

diff --git a/tests/data/test108 b/tests/data/test108
index 6f6e3c83c671c083e423f7bce03ce45a3976a6c5..7efc748d4106910c17a5b75d0fa513898ce063fb 100644 (file)
--- a/tests/data/test108
+++ b/tests/data/test108
@@ -21,9 +21,9 @@ ftp
 FTP PORT upload with CWD
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/%TESTNUMBER -T log/upload%TESTNUMBER -P -
+ftp://%HOSTIP:%FTPPORT/CWD/STOR/RETR/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -P -
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>

diff --git a/tests/data/test109 b/tests/data/test109
index 739e90b1cd302f4018fbdba0d7ddb960ffeb6109..baab37b30ffcf9e6e08d185a32dc2ff036449d90 100644 (file)
--- a/tests/data/test109
+++ b/tests/data/test109
@@ -21,9 +21,9 @@ ftp
 FTP PASV upload append
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER --append
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER --append
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>

diff --git a/tests/data/test1104 b/tests/data/test1104
index 0d89bde8eefca415556f97981891c366281fe825..2401be95588db9a01e479804318b51c9c90f2415 100644 (file)
--- 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
  </name>
  <command>
-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
 </command>
 <features>
 cookies

diff --git a/tests/data/test1105 b/tests/data/test1105
index 73a33a3c535c723e0cc14c82cf1d630fbbd30631..6434ab2e4079ffc96d73a9c8bd24caa8833277c5 100644 (file)
--- a/tests/data/test1105
+++ b/tests/data/test1105
@@ -35,7 +35,7 @@ http
 HTTP with cookie parser and header recording
  </name>
  <command>
-"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"
 </command>
 <precheck>
 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
 \r
 userid=myname&password=mypassword
 </protocol>
-<file name="log/cookie%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/cookie%TESTNUMBER.txt" mode="text">
 # 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 16588422fcd71361c79d29575758442495f1affb..b106c074ddffc691103a84b3df391d85f076a172 100644 (file)
--- a/tests/data/test1116
+++ b/tests/data/test1116
@@ -57,7 +57,7 @@ http
 HTTP GET with chunked trailer without Trailer:
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>
 
@@ -71,7 +71,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/heads%TESTNUMBER">
+<file name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
 Server: fakeit/0.9 fakeitbad/1.0\r
 Transfer-Encoding: chunked\r

diff --git a/tests/data/test112 b/tests/data/test112
index 6d23c4457333340a22cf1ea769da1e2533654867..c48506c366fded9f049fb39f53ef15283307389f 100644 (file)
--- a/tests/data/test112
+++ b/tests/data/test112
@@ -20,9 +20,9 @@ ftp
 FTP PASV upload resume
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C 40
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 40
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 this is the *****crap******** that we're gonna upload
 
 worx?

diff --git a/tests/data/test1129 b/tests/data/test1129
index df4a9b0f9a4cd3141708105aa8162c0d227e165e..2591be6d352042e6fa978c14020f2fc98713f901 100644 (file)
--- a/tests/data/test1129
+++ b/tests/data/test1129
@@ -41,7 +41,7 @@ skip: 1053700
 # Client-side
 <client>
 # 1053700 x 'x'
-<file name="log/file%TESTNUMBER">
+<file name="%LOGDIR/file%TESTNUMBER">
 %repeat[1053700 x x]%
 </file>
 <server>
@@ -51,7 +51,7 @@ http
 HTTP POST expect 100-continue with a 404
  </name>
  <command option="no-output">
--d @log/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
+-d @%LOGDIR/file%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER0001
 </command>
 </client>
 

diff --git a/tests/data/test1130 b/tests/data/test1130
index 50ebeddc89bbd8cd8f4edcfe2c9b916b27661623..1b434326535ea8a6316df78aaaf272b2042fadae 100644 (file)
--- a/tests/data/test1130
+++ b/tests/data/test1130
@@ -41,7 +41,7 @@ skip: 100
 # Client-side
 <client>
 # 100 x 'x'
-<file name="log/file%TESTNUMBER">
+<file name="%LOGDIR/file%TESTNUMBER">
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 </file>
 <server>
@@ -51,7 +51,7 @@ http
 HTTP POST forced expect 100-continue with a 404
  </name>
  <command option="no-output">
--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"
 </command>
 </client>
 

diff --git a/tests/data/test1131 b/tests/data/test1131
index 685e80e89428066932718a3054e05937aa905e38..13140dab47e5e9e7e2b0ef7b2fddaf0cace5fe3e 100644 (file)
--- a/tests/data/test1131
+++ b/tests/data/test1131
@@ -41,7 +41,7 @@ skip: 100
 # Client-side
 <client>
 # 100 x 'x'
-<file name="log/file%TESTNUMBER">
+<file name="%LOGDIR/file%TESTNUMBER">
 XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 </file>
 <server>
@@ -51,7 +51,7 @@ http
 HTTP PUT expect 100-continue with a 400
  </name>
  <command option="no-output">
--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
 </command>
 </client>
 

diff --git a/tests/data/test1133 b/tests/data/test1133
index ae6c323acb6d2f975459372e69f8b7e7dc5e4d7d..f79ece91a213db4c8d412f22dd91c9bd58c6ddfb 100644 (file)
--- a/tests/data/test1133
+++ b/tests/data/test1133
@@ -29,10 +29,10 @@ http
 HTTP RFC1867-type formposting with filename/data contains ',', ';', '"'
  </name>
  <command>
-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'
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER,and;.txt">
+<file name="%LOGDIR/test%TESTNUMBER,and;.txt">
 foo bar
 This is a bar foo
 bar

diff --git a/tests/data/test1136 b/tests/data/test1136
index 1ce53362274a4d7bcbb7ffb4ac56259079689189..a82079248cd26243467f76b78e5a6bca710ffa20 100644 (file)
--- a/tests/data/test1136
+++ b/tests/data/test1136
@@ -45,14 +45,14 @@ Check cookies against PSL
 TZ=GMT
 </setenv>
 <command>
-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
 </command>
 
 </client>
 
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/jar%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
 # 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 ce855524f0cbf0f049e451ab76539c14637e6785..570197ee97828c6ccbda6fb67b506f82fac5f90b 100644 (file)
--- 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/
 <command>
-file://bad-host%PWD/log/test%TESTNUMBER.txt
+file://bad-host%PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test1146 b/tests/data/test1146
index 0278ab89547f09c9ea51e5e1c268cfc17c4df4f3..55245bc523aaf91e35cf17b08728e465c6eb540c 100644 (file)
--- a/tests/data/test1146
+++ b/tests/data/test1146
@@ -25,9 +25,9 @@ file
 --proto-default file
 </name>
 <command option="no-include">
---proto-default file %PWD/log/test%TESTNUMBER.txt
+--proto-default file %PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test1147 b/tests/data/test1147
index 78cf49ad4df6d2f6fde1b635bf0d3f674d520a15..81c33a8c88f58314fe38903b2d542834e9a61435 100644 (file)
--- a/tests/data/test1147
+++ b/tests/data/test1147
@@ -35,7 +35,7 @@ http
  <name>
 Get -H headers from a file
  </name>
-<file name="log/heads%TESTNUMBER.txt">
+<file name="%LOGDIR/heads%TESTNUMBER.txt">
 One: 1
 Two: 2
 no-colon
@@ -46,7 +46,7 @@ no-colon
 User-Agent:
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @log/heads%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt
 </command>
 </client>
 

diff --git a/tests/data/test1148 b/tests/data/test1148
index 658cfcab84ced0a501eb4276ca389266ea21f112..dbd25921a6503a6f6c40d215c66bb9c2bf2e6a1d 100644 (file)
--- a/tests/data/test1148
+++ b/tests/data/test1148
@@ -35,7 +35,7 @@ http
 progress-bar
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -# --stderr log/stderrlog%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -# --stderr %LOGDIR/stderrlog%TESTNUMBER
 </command>
 <setenv>
 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.
-<file name="log/stderrlog%TESTNUMBER" mode="text">
+<file name="%LOGDIR/stderrlog%TESTNUMBER" mode="text">
 correct
 </file>
 <stripfile>

diff --git a/tests/data/test1151 b/tests/data/test1151
index 52e912ef90677304732c694e407c043d4b3fabc9..bb24d1b13378532dd2b4585e5fecdd7fd48a375d 100644 (file)
--- a/tests/data/test1151
+++ b/tests/data/test1151
@@ -39,7 +39,7 @@ http
 HTTP with too long cookies
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt
 </command>
 <features>
 cookies
@@ -55,7 +55,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/cookies%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
 # 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 011d310f579d315782cde4215b4668968c69ed3d..dbaf344e9f728485e4cce707129875eeda3bf439 100644 (file)
--- a/tests/data/test1155
+++ b/tests/data/test1155
@@ -28,7 +28,7 @@ http
 HTTP cookie with parameter word as name
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt
 </command>
 <features>
 cookies
@@ -44,7 +44,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/cookies%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
 # 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 8c0bcc3466e9754655414be826f0efd9ea69f693..53f1b9963e628745467caa9ea9d72a18c03acc1b 100644 (file)
--- a/tests/data/test1157
+++ b/tests/data/test1157
@@ -35,10 +35,10 @@ http
  <name>
 Get -H headers from empty file
  </name>
-<file name="log/heads%TESTNUMBER.txt">
+<file name="%LOGDIR/heads%TESTNUMBER.txt">
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @log/heads%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -H @%LOGDIR/heads%TESTNUMBER.txt
 </command>
 </client>
 

diff --git a/tests/data/test1158 b/tests/data/test1158
index 3352ba0583bbe1c10101c8bf840690fa5a6c74c4..fa6f7b41b2440a4d5a3bdabe76ce8ae31382aec7 100644 (file)
--- a/tests/data/test1158
+++ b/tests/data/test1158
@@ -29,13 +29,13 @@ http
 HTTP RFC1867-type formposting with filename containing '"'
 </name>
 <command>
-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"'
 </command>
 <precheck>
 perl -e "print 'Test requires a system supporting double quotes in file names' if ($^O eq 'msys');"
 </precheck>
 # We create this file before the command is invoked!
-<file name=log/test%TESTNUMBER".txt>
+<file name=%LOGDIR/test%TESTNUMBER".txt>
 foo bar
 This is a bar foo
 bar

diff --git a/tests/data/test1160 b/tests/data/test1160
index 7e31aa5dce5fe06bdcf7cd0e2674c6bf7a92ca82..e6835987e7a61867a6e72228aa27dd0c45863019 100644 (file)
--- a/tests/data/test1160
+++ b/tests/data/test1160
@@ -29,7 +29,7 @@ http
 HTTP with long funny format cookie
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt
 </command>
 <features>
 cookies
@@ -45,7 +45,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/cookies%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
 # 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 88ed491da1bff33782bb0e170e9c243358f56261..3b1a2fd191d92a9b1aad6f43fbdd2b9cc2d4f3de 100644 (file)
--- a/tests/data/test1161
+++ b/tests/data/test1161
@@ -28,7 +28,7 @@ http
 HTTP cookie with path set twice
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c log/cookies%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -c %LOGDIR/cookies%TESTNUMBER.txt
 </command>
 <features>
 cookies
@@ -44,7 +44,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/cookies%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/cookies%TESTNUMBER.txt" mode="text">
 # 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 e7f7df4665ad057877a1bbd4d55f2e94229ac621..512baf54d6319b8ee21b8ade2b8303fabae74fee 100644 (file)
--- a/tests/data/test1169
+++ b/tests/data/test1169
@@ -16,12 +16,12 @@ Verify that runtests.pl accepts an -L option
 </name>
 
 <command type="perl">
-%SRCDIR/runtests.pl -L %SRCDIR/log/test1196-library.pl
+%SRCDIR/runtests.pl -L %SRCDIR/%LOGDIR/test1196-library.pl
 </command>
 # Create a simple perl snippet that lets runtests.pl
 # exit with a code we can check.
 <precheck>
-echo 'exit 123' > %SRCDIR/log/test1196-library.pl
+echo 'exit 123' > %SRCDIR/%LOGDIR/test1196-library.pl
 </precheck>
 
 </client>

diff --git a/tests/data/test1176 b/tests/data/test1176
index d2471e1683d3b1a67e35c7460466ef1a6b3d1ee5..9ad1150f19db893dd860e8a516bd8ff74a06d204 100644 (file)
--- a/tests/data/test1176
+++ b/tests/data/test1176
@@ -34,7 +34,7 @@ http
 --output using #0
  </name>
  <command option="no-output">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o 'log/base-#0'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o '%LOGDIR/base-#0'
 </command>
 </client>
 
@@ -48,7 +48,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/base-#0">
+<file name="%LOGDIR/base-#0">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test1182 b/tests/data/test1182
index 105d3d1f4abda928fef2745817ad8b5cb1247d94..517892601953168c759c16efd7377c310243be0d 100644 (file)
--- a/tests/data/test1182
+++ b/tests/data/test1182
@@ -16,13 +16,13 @@ Verify that runtests.pl accepts an exclude file with the -E option
 </name>
 
 <command type="perl">
-%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
 </command>
 <precheck>
-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
 </precheck>
 <postcheck>
-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
 </postcheck>
 
 </client>

diff --git a/tests/data/test1185 b/tests/data/test1185
index eb672efa4e8186a4426e8c960cba5130c5996983..94c3be10c61ed5acc518b0ba61832f0e984f1db0 100644 (file)
--- a/tests/data/test1185
+++ b/tests/data/test1185
@@ -16,9 +16,9 @@ checksrc
 </name>
 
 <command type="perl">
-%SRCDIR/../scripts/checksrc.pl log/code%TESTNUMBER.c
+%SRCDIR/../scripts/checksrc.pl %LOGDIR/code%TESTNUMBER.c
 </command>
-<file name="log/code%TESTNUMBER.c">
+<file name="%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"
 <verify>
 <stdout>
-./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 8b3834cdab4eb320f9597c22b0c9b5273880524d..12faf093455eac77ae327dbea7f7b09fba8f2720 100644 (file)
--- a/tests/data/test1186
+++ b/tests/data/test1186
@@ -29,13 +29,13 @@ http
 Multipart formposting with backslash-escaping filename containing '"'
 </name>
 <command>
-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"'
 </command>
 <precheck>
 perl -e "print 'Test requires a system supporting double quotes in file names' if ($^O eq 'msys');"
 </precheck>
 # We create this file before the command is invoked!
-<file name=log/test%TESTNUMBER".txt>
+<file name=%LOGDIR/test%TESTNUMBER".txt>
 foo bar
 This is a bar foo
 bar

diff --git a/tests/data/test1189 b/tests/data/test1189
index c7f21d6f8fadc8ed20ca8f766adb34bf2b7953aa..cacac5d754573924fb3785107b8348afc9828e2d 100644 (file)
--- a/tests/data/test1189
+++ b/tests/data/test1189
@@ -29,10 +29,10 @@ http
 Multipart formposting with backslash-escaping of name= and filename=
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --form-escape -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@log/test%TESTNUMBER.txt;type=moo/foobar;filename=fakerfile" -F file2=@log/test%TESTNUMBER.txt -F "file3=@\"log/test%TESTNUMBER.txt\";type=mo/foo;filename=\"f\\\\\\\\ak\\\\\\er,\\\\an\\d;.t\\\"xt\"" -F 'file4=@"log/test%TESTNUMBER.txt"; filename="A\\AA\"\"\\\"ZZZ"'
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --form-escape -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@%LOGDIR/test%TESTNUMBER.txt;type=moo/foobar;filename=fakerfile" -F file2=@%LOGDIR/test%TESTNUMBER.txt -F "file3=@\"%LOGDIR/test%TESTNUMBER.txt\";type=mo/foo;filename=\"f\\\\\\\\ak\\\\\\er,\\\\an\\d;.t\\\"xt\"" -F 'file4=@"%LOGDIR/test%TESTNUMBER.txt"; filename="A\\AA\"\"\\\"ZZZ"'
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo bar
 This is a bar foo
 bar

diff --git a/tests/data/test1193 b/tests/data/test1193
index bed10b24191e411bd9da48739b496b25ad4f88f2..531efa2597b7c4d4e1588ac1b68aa34fa9ba226e 100644 (file)
--- a/tests/data/test1193
+++ b/tests/data/test1193
@@ -26,9 +26,9 @@ mqtt
 MQTT PUBLISH 2k payload
 </name>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d @log/payload%TESTNUMBER
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -d @%LOGDIR/payload%TESTNUMBER
 </command>
-<file name="log/payload%TESTNUMBER">
+<file name="%LOGDIR/payload%TESTNUMBER">
 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789
 123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789

diff --git a/tests/data/test1210 b/tests/data/test1210
index 89cfe61eaf48bb50575d4c1cd64399c7fd111afa..4a07147f92f72216f19d2f4ee258670906912f94 100644 (file)
--- a/tests/data/test1210
+++ b/tests/data/test1210
@@ -36,7 +36,7 @@ http
 HTTP GET with -J without Content-Disposition
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER?junk -J -O
@@ -53,7 +53,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 12345
 </file>
 

diff --git a/tests/data/test1216 b/tests/data/test1216
index 0b1bad606d5a8e4067c91d6138bbc0c2705a295e..b812f8d9bccfab6a64ccd87d70fe91bccbc9db76 100644 (file)
--- a/tests/data/test1216
+++ b/tests/data/test1216
@@ -31,9 +31,9 @@ http
 HTTP cookie domains tailmatching the host name
  </name>
  <command>
-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
 </command>
-<file name="log/injar%TESTNUMBER">
+<file name="%LOGDIR/injar%TESTNUMBER">
 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 49cbf2c4916355ea5864f465f4c6de66bd51e3f8..d7e2ff94245a2dc286d4e1c9a8931cb58a09fe20 100644 (file)
--- a/tests/data/test1220
+++ b/tests/data/test1220
@@ -21,9 +21,9 @@ file
 file:// URLs with query string
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test%TESTNUMBER.txt?a_query=foobar#afragment
+file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt?a_query=foobar#afragment
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 contents in a single file
 </file>
 </client>

diff --git a/tests/data/test1221 b/tests/data/test1221
index 9382312b831c5fcc8b250599dc642981a8ff307f..42617e85b0afd770f38f8e32ca22f658299acfef 100644 (file)
--- a/tests/data/test1221
+++ b/tests/data/test1221
@@ -29,9 +29,9 @@ http
 --url-query with --data-urlencode
  </name>
  <command>
-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"
 </command>
-<file name="log/%TESTNUMBER.txt">
+<file name="%LOGDIR/%TESTNUMBER.txt">
 content to _?!#$'|<>
 </file>
 </client>

diff --git a/tests/data/test123 b/tests/data/test123
index 1604f0b0c7eeb93402dbe6562eec7fa41df7bc08..21d3b58ae1444a5c7dac57f2de569d6cb2581839 100644 (file)
--- a/tests/data/test123
+++ b/tests/data/test123
@@ -19,9 +19,9 @@ ftp
 FTP upload resume with whole file already downloaded
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C 51
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C 51
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 --------------------------------------------------
 </file>
 </client>

diff --git a/tests/data/test1243 b/tests/data/test1243
index ba08a837f8dd558c9046920866bf2290aeb2c46d..7f71631917d99596ecac755473dbc8101437a3d1 100644 (file)
--- a/tests/data/test1243
+++ b/tests/data/test1243
@@ -16,9 +16,9 @@ tftp
 TFTP send without TFTP options requests
  </name>
  <command>
--T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// --tftp-no-options
+-T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT// --tftp-no-options
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 a chunk of
 data
 sent

diff --git a/tests/data/test1268 b/tests/data/test1268
index 562f376a33fd8f8b9e2bc74a40749b4c9471f11c..257b4726ed02496da38aed4c50c83d49bb5ee63d 100644 (file)
--- a/tests/data/test1268
+++ b/tests/data/test1268
@@ -23,12 +23,12 @@ unix-sockets
 file name argument looks like a flag
  </name>
  <command>
---stderr log/moo%TESTNUMBER --unix-socket -k hej://moo
+--stderr %LOGDIR/moo%TESTNUMBER --unix-socket -k hej://moo
 </command>
 </client>
 
 <verify>
-<file name="log/moo%TESTNUMBER" mode="text">
+<file name="%LOGDIR/moo%TESTNUMBER" mode="text">
 Warning: The file name argument '-k' looks like a flag.
 curl: (1) Protocol "hej" not supported or disabled in libcurl
 </file>

diff --git a/tests/data/test1271 b/tests/data/test1271
index 184fd87f135583dc37a047a8f7f9baafa92fe5d6..2d412a6bf75546c8c6eeec5204fb1fa83429a929 100644 (file)
--- a/tests/data/test1271
+++ b/tests/data/test1271
@@ -27,9 +27,9 @@ http
 --write-out from file with empty file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w @log/blank%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/we/want/our/%TESTNUMBER -w @%LOGDIR/blank%TESTNUMBER
 </command>
-<file name="log/blank%TESTNUMBER">
+<file name="%LOGDIR/blank%TESTNUMBER">
 </file>
 </client>
 

diff --git a/tests/data/test1273 b/tests/data/test1273
index 0c076cb961e8b5203f248e3d31120a44f1e9e81b..d724fdd8430d50aa26f75689af1ecfc801b76dfe 100644 (file)
--- a/tests/data/test1273
+++ b/tests/data/test1273
@@ -53,7 +53,7 @@ http
  <command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C - -f
 </command>
-<file name="log/curl%TESTNUMBER.out">
+<file name="%LOGDIR/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678

diff --git a/tests/data/test1274 b/tests/data/test1274
index f640a69f614e466171d7902a1bf059bad87d3a9b..5198537876fdb25cec977f69929d441bb07f878a 100644 (file)
--- a/tests/data/test1274
+++ b/tests/data/test1274
@@ -36,7 +36,7 @@ http
 HTTP header line folding
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/out%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/out%TESTNUMBER
 </command>
 </client>
 
@@ -50,7 +50,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/out%TESTNUMBER">
+<file name="%LOGDIR/out%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 %if hyper

diff --git a/tests/data/test1278 b/tests/data/test1278
index ba3056908812c77c16422dc5c75ef011303dc14d..951644637407026306142de4d548d4b410ffd049 100644 (file)
--- a/tests/data/test1278
+++ b/tests/data/test1278
@@ -34,7 +34,7 @@ http
 verify extra --no-remote-name
 </name>
 <command option="no-output">
-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'
 </command>
 </client>
 

diff --git a/tests/data/test128 b/tests/data/test128
index c9429c5fe0e62965a07de8cbfa7f2037645af9a8..e3ed4157bdc5850ec691d9580aaac1aaa792a438 100644 (file)
--- a/tests/data/test128
+++ b/tests/data/test128
@@ -20,9 +20,9 @@ ftp
 FTP upload with --crlf
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER --crlf
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER --crlf
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 file
 with unix newlines
 meant to be

diff --git a/tests/data/test1283 b/tests/data/test1283
index df0458cc54e183b0b12fc08f15ff990dbbb20d48..1e8e9d44744e8095be25621812fb8dda2b5c95aa 100644 (file)
--- a/tests/data/test1283
+++ b/tests/data/test1283
@@ -30,7 +30,7 @@ http
 globbing range with same start and stop
 </name>
 <command option="no-output">
-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"
 </command>
 </client>
 
@@ -43,7 +43,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/outfile%TESTNUMBER_a1b2.dump">
+<file name="%LOGDIR/outfile%TESTNUMBER_a1b2.dump">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Content-Length: 6\r

diff --git a/tests/data/test1285 b/tests/data/test1285
index 0a907b60ec2481354547109de07a033f0f7eb7d9..986cb92cc76c4df215d4add73568df24585efed4 100644 (file)
--- 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
 <command>
--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
 </command>
-<file name="log/put%TESTNUMBER">
+<file name="%LOGDIR/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three

diff --git a/tests/data/test1287 b/tests/data/test1287
index 0d0ad47d06acc6553a0137b6ec716ef3d596117b..c4815314bf1a76b76c431f7493c6544264fb5b0b 100644 (file)
--- a/tests/data/test1287
+++ b/tests/data/test1287
@@ -82,7 +82,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/stderr%TESTNUMBER" mode="text">
+<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
 %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 5997dcc3ba4b431d4db199c120bc5b3813b88fb8..ea9a0c6ab4060ef7712dbbeafcbf763261a4e8a1 100644 (file)
--- a/tests/data/test1291
+++ b/tests/data/test1291
@@ -24,14 +24,14 @@ none
 Attempt to upload 1000 files but fail immediately
 </name>
 <command>
--K log/cmd%TESTNUMBER --fail-early
+-K %LOGDIR/cmd%TESTNUMBER --fail-early
 </command>
-<file name="log/upload-this">
+<file name="%LOGDIR/upload-this">
 XXXXXXXx
 </file>
 # generate the config file
 <precheck>
-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;
 </precheck>
 </client>
 

diff --git a/tests/data/test130 b/tests/data/test130
index 31447cbbe3a42750576defb5119a45e42f21255b..665d0590f0569a81303a0b369b9c86a7bc0eb189 100644 (file)
--- a/tests/data/test130
+++ b/tests/data/test130
@@ -37,9 +37,9 @@ ftp
 FTP (optional .netrc; no user/pass) dir list PASV
  </name>
  <command>
---netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 # 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 699a2e43f5bddb12c0e17944327e4338ab5adeff..438e5886c7026c5177dbc16ffca97064c3f2fb28 100644 (file)
--- a/tests/data/test1304
+++ b/tests/data/test1304
@@ -18,7 +18,7 @@ unittest
  <name>
 netrc parsing unit tests
  </name>
-<file name="log/netrc%TESTNUMBER">
+<file name="%LOGDIR/netrc%TESTNUMBER">
 machine example.com login admin password passwd
 machine curl.example.com login none password none
 </file>

diff --git a/tests/data/test1308 b/tests/data/test1308
index 3e827365c2fabb74a0f26b55c82ca2fcf2419d9e..9bd5c056d4df186e2d3e9a447f457d92a6c87f9d 100644 (file)
--- a/tests/data/test1308
+++ b/tests/data/test1308
@@ -21,7 +21,7 @@ Mime
  <name>
 formpost unit tests
  </name>
-<file name="log/test-%TESTNUMBER">
+<file name="%LOGDIR/test-%TESTNUMBER">
 Piece of the file that is to uploaded as a formpost
 </file>
 </client>

diff --git a/tests/data/test131 b/tests/data/test131
index 63bd021945e77355546e146c5970755d2b3e3985..52bff92d4b3747b1fc8712752de513b51f903931 100644 (file)
--- a/tests/data/test131
+++ b/tests/data/test131
@@ -38,9 +38,9 @@ ftp
 FTP (optional .netrc; user/no pass) dir list PASV
  </name>
  <command>
---netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://user2@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://user2@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 # 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 6d5496f0c4328c15457224f54f88fcd091fda80f..8e48794a08a9f31e474ad35567a88d3c24b59287 100644 (file)
--- a/tests/data/test1311
+++ b/tests/data/test1311
@@ -37,7 +37,7 @@ http
 HTTP GET with -J and Content-Disposition
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
@@ -54,7 +54,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/name%TESTNUMBER">
+<file name="%LOGDIR/name%TESTNUMBER">
 12345
 </file>
 

diff --git a/tests/data/test1312 b/tests/data/test1312
index 2d48914580a201ecdd1a881fe95f83e314a5ab22..c8170a8afafe8f8b4cb6a04c80571e1b66909ee3 100644 (file)
--- a/tests/data/test1312
+++ b/tests/data/test1312
@@ -37,7 +37,7 @@ http
 HTTP GET with -J, Content-Disposition and ; in filename
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 %HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
@@ -54,7 +54,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/name%TESTNUMBER;weird">
+<file name="%LOGDIR/name%TESTNUMBER;weird">
 12345
 </file>
 

diff --git a/tests/data/test1313 b/tests/data/test1313
index b1ac1fcea151c53edbd74583fa3842ec2190eee4..8a285974403ca98f3423f4e5b003ba04b8ae687a 100644 (file)
--- a/tests/data/test1313
+++ b/tests/data/test1313
@@ -37,7 +37,7 @@ http
 HTTP GET with -J, Content-Disposition, uneven quotes
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O
@@ -54,7 +54,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/name%TESTNUMBER">
+<file name="%LOGDIR/name%TESTNUMBER">
 12345
 </file>
 

diff --git a/tests/data/test1315 b/tests/data/test1315
index dd66df71ac4633b07cc124d8caf3c8f670f6f2a9..e1de8f68ce0dacd86c932494d225be61a63f1a49 100644 (file)
--- 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
  </name>
  <command>
-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'
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 dummy data
 </file>
 </client>

diff --git a/tests/data/test132 b/tests/data/test132
index d33980fa7df33448394ff6b1c414211963715993..b02d9939992c9a123574f495fb05c09b1247b5c5 100644 (file)
--- a/tests/data/test132
+++ b/tests/data/test132
@@ -37,9 +37,9 @@ ftp
 FTP (optional .netrc; user/passwd supplied) dir list PASV
  </name>
  <command>
---netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 # 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 791189b90a601559d5409c93198218d8087a41cc..5941e5005ee03c8d98409b9d7d537496e8c4af25 100644 (file)
--- 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\r
 \r
 </stdin>
-<file name="log/%TESTNUMBER.txt">
+<file name="%LOGDIR/%TESTNUMBER.txt">
 GET /we/want/%TESTNUMBER HTTP/1.0\r
 \r
 </file>
  <command option="no-output">
-telnet://%HOSTIP:%HTTPPORT -T log/%TESTNUMBER.txt
+telnet://%HOSTIP:%HTTPPORT -T %LOGDIR/%TESTNUMBER.txt
 </command>
 </client>
 

diff --git a/tests/data/test1328 b/tests/data/test1328
index b7b3e3247bcc61c76144a12f8de947dbd65b5dc8..a85c6b6eef9ad5eb98f26d8374d06145caae4241 100644 (file)
--- a/tests/data/test1328
+++ b/tests/data/test1328
@@ -47,7 +47,7 @@ http
 HTTP GET a globbed range with -f
  </name>
  <command>
--f 'http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0000-%TESTNUMBER0001]' -o log/#1
+-f 'http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0000-%TESTNUMBER0001]' -o %LOGDIR/#1
 </command>
 </client>
 

diff --git a/tests/data/test133 b/tests/data/test133
index ad0d2def77c0c96774582b71194f7d0e00eee8fe..8b914cb713f5505d6c5c178e6c42df28f824b612 100644 (file)
--- a/tests/data/test133
+++ b/tests/data/test133
@@ -37,9 +37,9 @@ ftp
 FTP compulsory .netrc; ignore passwd in URL
  </name>
  <command>
--n --netrc-file log/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/
+-n --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary:mark@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 # 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 2cc5aedd7690262b1018d2b90fb35bb923707271..0dd8f7d267674bf6d8abca8ad96813aeec29ab66 100644 (file)
--- a/tests/data/test1330
+++ b/tests/data/test1330
@@ -31,7 +31,7 @@ nothing
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/memdump">
+<file name="%LOGDIR/memdump">
 MEM unit%TESTNUMBER.c: malloc()
 MEM unit%TESTNUMBER.c: free()
 </file>

diff --git a/tests/data/test1331 b/tests/data/test1331
index 7683d6272e93f76237949df8265ad7c06664f929..a233c63c4e7abc8f8fd69573204d167c25cc83a4 100644 (file)
--- a/tests/data/test1331
+++ b/tests/data/test1331
@@ -62,7 +62,7 @@ http
 HTTP --proxy-anyauth and 407 with cookies
  </name>
  <command>
--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
 </command>
 <features>
 cookies

diff --git a/tests/data/test1334 b/tests/data/test1334
index b19155923c62f98fb0a43f88046a0426af59c8e2..88a41d8b2bb0ec5bf29c89de12afedb020d024e2 100644 (file)
--- a/tests/data/test1334
+++ b/tests/data/test1334
@@ -35,10 +35,10 @@ http
 HTTP GET with -O without Content-Disposition, -D file
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D log/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>
 
@@ -53,11 +53,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -67,7 +67,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1335 b/tests/data/test1335
index e3507603bbb4d8b65f3ad8dd768c695614a4e046..4d64ea877f6b9abdeafb6f4f6b3ffdfd7667f0f9 100644 (file)
--- a/tests/data/test1335
+++ b/tests/data/test1335
@@ -35,7 +35,7 @@ http
 HTTP GET with -O without Content-Disposition, -D stdout
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D -
@@ -53,11 +53,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test1336 b/tests/data/test1336
index 631f204e849c91cbf38642089b90b12becbd2ac4..993d8c6f87baf35a0159964d30df7cd7b8bcccbd 100644 (file)
--- a/tests/data/test1336
+++ b/tests/data/test1336
@@ -36,13 +36,13 @@ http
 HTTP GET with -O and Content-Disposition, -D file
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D log/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -57,11 +57,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1337 b/tests/data/test1337
index 808c8a2a4b07d27bf3d44c1f28b7e31a3c9b1720..4b954d063a142735aba966d5de9e2e4d65c8d763 100644 (file)
--- a/tests/data/test1337
+++ b/tests/data/test1337
@@ -36,13 +36,13 @@ http
 HTTP GET with -O and Content-Disposition, -D stdout
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -57,11 +57,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test1338 b/tests/data/test1338
index 672e9aea89468e0a7a4341401eab75f50f7e7e7d..c1c271a95ef0279fe6cdd41710d1d449a33b22a3 100644 (file)
--- a/tests/data/test1338
+++ b/tests/data/test1338
@@ -36,10 +36,10 @@ http
 HTTP GET with -O -J without Content-Disposition, -D file
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D log/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>
 
@@ -54,11 +54,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -68,7 +68,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1339 b/tests/data/test1339
index 4bc77e97627041a8895f813fd7612a51f3ee1b2d..a46934d3a3783a0be55c27b66423905d4bc340c4 100644 (file)
--- a/tests/data/test1339
+++ b/tests/data/test1339
@@ -36,7 +36,7 @@ http
 HTTP GET with -O -J without Content-Disposition, -D stdout
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D -
@@ -54,11 +54,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test134 b/tests/data/test134
index 00d1732df46608fba6d10a2080abc6b50c301945..d0716c3d12fd129e3b520ca2c3f5d0f3d70f90fa 100644 (file)
--- 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
 <command>
---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/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 # 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 e48907bb420e87e2e75b7a50c781b9d077dd0acc..ebec701a6448511567ee73348b9ebc5b917773bb 100644 (file)
--- a/tests/data/test1340
+++ b/tests/data/test1340
@@ -37,10 +37,10 @@ http
 HTTP GET with -O -J and Content-Disposition, -D file
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%PWD/%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-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"
 </command>
 </client>
 
@@ -55,11 +55,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/name%TESTNUMBER">
+<file1 name="%LOGDIR/name%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -70,8 +70,8 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER" mode="text">
-curl saved to filename %PWD/log/name%TESTNUMBER
+<file3 name="%LOGDIR/stdout%TESTNUMBER" mode="text">
+curl saved to filename %PWD/%LOGDIR/name%TESTNUMBER
 </file3>
 
 </verify>

diff --git a/tests/data/test1341 b/tests/data/test1341
index cf13a1fecd243a36cad8eb9c10cff2b1e2333869..75d9daae74c66aca39563f4c9d8ab3fc3b885861 100644 (file)
--- a/tests/data/test1341
+++ b/tests/data/test1341
@@ -37,7 +37,7 @@ http
 HTTP GET with -O -J and Content-Disposition, -D stdout
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%PWD/%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O -D - -w "curl saved to filename %{filename_effective}\n"
@@ -55,11 +55,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/name%TESTNUMBER">
+<file1 name="%LOGDIR/name%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -68,7 +68,7 @@ Connection: close
 Content-Type: text/html\r
 Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange\r
 \r
-curl saved to filename %PWD/log/name%TESTNUMBER
+curl saved to filename %PWD/%LOGDIR/name%TESTNUMBER
 </file2>
 
 </verify>

diff --git a/tests/data/test1342 b/tests/data/test1342
index 6bab2831e475e686fd10ca14d466ee724ac1a9e8..39dbfab57d63e439ad7f668e622a8cc006b82098 100644 (file)
--- a/tests/data/test1342
+++ b/tests/data/test1342
@@ -35,10 +35,10 @@ http
 HTTP GET with -O -i without Content-Disposition, -D file
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D log/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>
 
@@ -53,7 +53,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -74,7 +74,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1343 b/tests/data/test1343
index 3f0d63059dde6567a193b54aebcd35bdd459b96c..6a9eb7dc81702f0e82940fca31626ca7bf067c2e 100644 (file)
--- a/tests/data/test1343
+++ b/tests/data/test1343
@@ -35,7 +35,7 @@ http
 HTTP GET with -O -i without Content-Disposition, -D stdout
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D -
@@ -53,7 +53,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test1344 b/tests/data/test1344
index bb33616791d467daa8ae03db7f8671c8332e37cc..ba4b38976d62a11b035cb9a1627054494d560439 100644 (file)
--- a/tests/data/test1344
+++ b/tests/data/test1344
@@ -36,13 +36,13 @@ http
 HTTP GET with -O -i and Content-Disposition, -D file
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D log/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D %LOGDIR/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -57,7 +57,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -69,7 +69,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -80,7 +80,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1345 b/tests/data/test1345
index bd9470c14973fbd516921a5f41279bec780f4965..a9298e4e27e2b2beed6438c8c416428c57b47b0f 100644 (file)
--- a/tests/data/test1345
+++ b/tests/data/test1345
@@ -36,13 +36,13 @@ http
 HTTP GET with -O -i and Content-Disposition, -D stdout
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -57,7 +57,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -69,7 +69,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test1346 b/tests/data/test1346
index 32d434d03f8083719e4995d091677b296d4ecd6e..bab67cb6310816b3258e624da3b27c9f8c2a9122 100644 (file)
--- a/tests/data/test1346
+++ b/tests/data/test1346
@@ -35,7 +35,7 @@ http
 HTTP GET with -O -i without Content-Disposition, without -D
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O
@@ -53,7 +53,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1347 b/tests/data/test1347
index 46e1ae608d1c7da6206a5f3dc084125554445687..868e2611c899f009136cca7821adfa0f83eba2c7 100644 (file)
--- a/tests/data/test1347
+++ b/tests/data/test1347
@@ -36,13 +36,13 @@ http
 HTTP GET with -O -i and Content-Disposition, without -D
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -O
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -57,7 +57,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/%TESTNUMBER">
+<file1 name="%LOGDIR/%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -69,7 +69,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1348 b/tests/data/test1348
index df7a620c3ac91e64e6ecbad289f6d7c57091697c..3de0b4a93bb1bf4ef25e455ba4cb715c0aba5ce1 100644 (file)
--- a/tests/data/test1348
+++ b/tests/data/test1348
@@ -28,7 +28,7 @@ ftp
 FTP download, file without Content-Disposition inside, using -O
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O
@@ -49,12 +49,12 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1349 b/tests/data/test1349
index 10ba0bddc77c58c4e2324f17bfb3c7428c0156aa..d2565496cbae049aa6665f371ccad58060d559f9 100644 (file)
--- a/tests/data/test1349
+++ b/tests/data/test1349
@@ -28,10 +28,10 @@ ftp
 FTP download, file without C-D inside, using -O -D file
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D log/heads%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>
 
@@ -49,14 +49,14 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -76,7 +76,7 @@ mooo
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1350 b/tests/data/test1350
index e9ea522bad63f511bf1dd2383f762956389e6fc7..b5568f536b7d72f4708382979ac6f8b6d1685688 100644 (file)
--- a/tests/data/test1350
+++ b/tests/data/test1350
@@ -28,7 +28,7 @@ ftp
 FTP download, file without C-D inside, using -O -D stdout
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D -
@@ -49,14 +49,14 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1351 b/tests/data/test1351
index 4c8ed4caad9da453cbf9dc981dc024b0c70074c4..93232d55cd9a34c67dca7252f2309303f1b3674a 100644 (file)
--- 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
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D log/heads%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>
 
@@ -50,14 +50,14 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -77,7 +77,7 @@ mooo
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1352 b/tests/data/test1352
index 3af12a801590be9c338c4924ef2cbdcb49060443..0649289b64d9dc0edc04183a34b5cffc6b79b290 100644 (file)
--- 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
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D -
@@ -50,14 +50,14 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1353 b/tests/data/test1353
index 34049706dfa1837a46e9c6c8f31000ff0841f75b..8e0ad50e4fa1bf7eab70a329d45f624876de501a 100644 (file)
--- 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
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D log/heads%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>
 
@@ -49,14 +49,14 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
 # The final "221 bye bye baby" response to QUIT will not be recorded
 # since that is not considered part of this particular transfer!
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -76,7 +76,7 @@ mooo
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1354 b/tests/data/test1354
index e5d15635a47e010e7d2694472e02ccbd7f95ebbc..506ec90e45c909f12907cb9a8b58669ca32eb6a9 100644 (file)
--- 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
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D -
@@ -49,12 +49,12 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1355 b/tests/data/test1355
index f008803e67319008487bd37ea92702919bccb8e6..fa19fabc4acf53bab544ef0669a3273fe90a9e76 100644 (file)
--- 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
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i
@@ -49,12 +49,12 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1356 b/tests/data/test1356
index 7be22473a3b74f9c7aa1dcbab7aa7381d8b49d37..0c326f48c7f6a8e0961a9378ca2714aa7e46e43a 100644 (file)
--- a/tests/data/test1356
+++ b/tests/data/test1356
@@ -36,13 +36,13 @@ ftp
 FTP download, file with Content-Disposition inside, using -O
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -60,7 +60,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 MOOOO
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1357 b/tests/data/test1357
index ebb102c95c4fc08b2bae61fbd7e10049c01842c8..9d395a875045a4b5f5b7ec701bfd1a59173a65f6 100644 (file)
--- a/tests/data/test1357
+++ b/tests/data/test1357
@@ -36,13 +36,13 @@ ftp
 FTP download, file with C-D inside, using -O -D file
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D log/heads%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D %LOGDIR/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -60,7 +60,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 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
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -92,7 +92,7 @@ MOOOO
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1358 b/tests/data/test1358
index 983e1cdc0be6a9378453055881922a04fe0cb100..973ef7cf4c0fa04d6f304c3784bdda517f630173 100644 (file)
--- a/tests/data/test1358
+++ b/tests/data/test1358
@@ -36,13 +36,13 @@ ftp
 FTP download, file with C-D inside, using -O -D stdout
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -60,7 +60,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 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
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1359 b/tests/data/test1359
index c4fb2eec437d02d8ecd930e6f4820d8edcb92e63..fc1eb372892bd4cc16ea37333cf6c41040d9eb8d 100644 (file)
--- 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
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D log/heads%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D %LOGDIR/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -61,7 +61,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 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
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -93,7 +93,7 @@ MOOOO
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1360 b/tests/data/test1360
index 3f7b43535b6acdc60a7e6f269bf1409184c7b613..1fb80eecdb4172cc3f4825eac782535f47ac9e5d 100644 (file)
--- 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
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -J -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -61,7 +61,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 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
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1361 b/tests/data/test1361
index 3f1f378936539cd1b3d644bed36fd858fca0c18b..6b9af1ad8adcfb6f1554d6b1ec776b50e92b8ca4 100644 (file)
--- 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
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D log/heads%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D %LOGDIR/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -60,7 +60,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 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
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -92,7 +92,7 @@ MOOOO
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1362 b/tests/data/test1362
index c5a09cbe8a4f331a1fa209757387901e7d8510f2..03d99047b7cbb1305b7e13127f7cda24e0ebf3ac 100644 (file)
--- 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
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -60,7 +60,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 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
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1363 b/tests/data/test1363
index e48074b46f2654091c281233224a61abcc41152d..009f68cae22d4b5bf8f170c5dcffc1174d7a6aab 100644 (file)
--- 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
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -O -i
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -60,7 +60,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/file%TESTNUMBER">
+<file1 name="%LOGDIR/file%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 MOOOO
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1364 b/tests/data/test1364
index ac2c423d29e8fc4d5410cf9e9666b228f6ee3fb7..0ea1e2b12e135f03a1fba4dc89485b563a39d3f3 100644 (file)
--- a/tests/data/test1364
+++ b/tests/data/test1364
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname without Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -48,11 +48,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -62,7 +62,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1365 b/tests/data/test1365
index cee54b3a7d3f6c1300adbcaaaa23e109663caea8..abd371c010163322a882ae5e61ebf5ef45527740 100644 (file)
--- a/tests/data/test1365
+++ b/tests/data/test1365
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname without Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -48,11 +48,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test1366 b/tests/data/test1366
index ae634cf65d34f63c4dd74929cb8f8f9a41e92d4b..78f5573ea475176dbfe82e83b5c8faa62557e49c 100644 (file)
--- a/tests/data/test1366
+++ b/tests/data/test1366
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname and Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D log/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -49,11 +49,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1367 b/tests/data/test1367
index a74a4c423a3c1b690fb140d805daec54bab7b05e..24929365a0a38b40972f8de1b22144a5617b0bd7 100644 (file)
--- a/tests/data/test1367
+++ b/tests/data/test1367
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname and Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/outfile%TESTNUMBER -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -49,11 +49,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test1368 b/tests/data/test1368
index 629a635d9a5d7df5afd10c67b7c16b618b971e7e..1d6d181b08e3afe63f2488b17b8b19305a367e5f 100644 (file)
--- a/tests/data/test1368
+++ b/tests/data/test1368
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -J without Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -49,11 +49,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -63,7 +63,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1369 b/tests/data/test1369
index 08665d12dfc0617f0e1f4d29f3d7ade48cefcec2..48fd31806f0136e5eeabf241c4ede349e5b94dea 100644 (file)
--- a/tests/data/test1369
+++ b/tests/data/test1369
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -J without Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -49,11 +49,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test1370 b/tests/data/test1370
index 96e7e745786307c0fd39bc6321a7eb8a880da8fb..d769401435858e17fffb741b86e76f550c2de267 100644 (file)
--- a/tests/data/test1370
+++ b/tests/data/test1370
@@ -32,10 +32,10 @@ http
 HTTP GET -o fname -J and Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,11 +50,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -65,7 +65,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1371 b/tests/data/test1371
index aa5c69a752205c301b448583868d7ac0d00dea16..8565363b93e9855ad9f202fe87fcd67fc9d7af5a 100644 (file)
--- a/tests/data/test1371
+++ b/tests/data/test1371
@@ -32,10 +32,10 @@ http
 HTTP GET -o fname -J and Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o log/outfile%TESTNUMBER -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -50,11 +50,11 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test1372 b/tests/data/test1372
index 29c478cdf6e7a9156ae0483529514387cdae4f2a..76b367132efc1872de6be67fc90db0b389dd0189 100644 (file)
--- a/tests/data/test1372
+++ b/tests/data/test1372
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname -i without Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -48,7 +48,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -59,7 +59,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -69,7 +69,7 @@ Content-Type: text/html
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1373 b/tests/data/test1373
index b4c737d68dda0229726664e76b48f2b237b1fe50..c475deb9f0c9f7867a628fc99ae051e65372dcd4 100644 (file)
--- a/tests/data/test1373
+++ b/tests/data/test1373
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname -i without Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -48,7 +48,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -59,7 +59,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test1374 b/tests/data/test1374
index 07bd3bb5a6fd46d94b43010a14519b63a0974351..aa2b3e346e86f34621afcaffbb32672d8df7aa2b 100644 (file)
--- a/tests/data/test1374
+++ b/tests/data/test1374
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -i and Content-Disposition, -D file
 </name>
 <command option="no-output,no-include">
-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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -49,7 +49,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -61,7 +61,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 12345
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -72,7 +72,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 \r
 </file2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1375 b/tests/data/test1375
index 2acdb54a156e315dc01081003875dd4905075c9b..6df5526360fbc67ab2f738701c11b761bd729acc 100644 (file)
--- a/tests/data/test1375
+++ b/tests/data/test1375
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -i and Content-Disposition, -D stdout
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER -D -
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -49,7 +49,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -61,7 +61,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r

diff --git a/tests/data/test1376 b/tests/data/test1376
index f81f35fe3d5a0754706c340b76d3d093595faab9..f3d36e0af3a4a8136a1947a5982322bbb600a037 100644 (file)
--- a/tests/data/test1376
+++ b/tests/data/test1376
@@ -30,10 +30,10 @@ http
 HTTP GET -o fname -i without Content-Disposition, without -D
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -48,7 +48,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -59,7 +59,7 @@ Content-Type: text/html
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1377 b/tests/data/test1377
index 745f08f4891ffe27f4fb5a6975c016eb206936df..d1a6b72134f697c06c329035e0212462c60809df 100644 (file)
--- a/tests/data/test1377
+++ b/tests/data/test1377
@@ -31,10 +31,10 @@ http
 HTTP GET -o fname -i and Content-Disposition, without -D
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o log/outfile%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -i -o %LOGDIR/outfile%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -49,7 +49,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -61,7 +61,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 12345
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1378 b/tests/data/test1378
index d04e740bf83d5afa0ef66a5a179607e6407797bf..7348a3f175833b14055be9bcb30668f80a4ddbd8 100644 (file)
--- a/tests/data/test1378
+++ b/tests/data/test1378
@@ -23,10 +23,10 @@ ftp
 FTP DL, file without Content-Disposition inside, using -o fname
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -44,12 +44,12 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1379 b/tests/data/test1379
index e611ac6b812ffb2b0638a1c94375d0df9f5a2142..0b8d20ae0c32691ab995866b01470ff11d3c09df 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -44,12 +44,12 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -69,7 +69,7 @@ mooo
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1380 b/tests/data/test1380
index 3cc52613baaf853e77a1177d0d226a91064d7e39..187dd8cdbbc8813745860da2ca179d4ddfe3a417 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -44,12 +44,12 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1381 b/tests/data/test1381
index a62ee4748427457df623fcd8bd0307dd5d5811e8..4ba20eb3e67484a3e7337ebf8cfafd3f5f4fa6bb 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -45,12 +45,12 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -70,7 +70,7 @@ mooo
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1382 b/tests/data/test1382
index 8c49877b1a152b76436d4e27f5dbdfeeb675b105..26ff7acbe8bba9d2a12c682c5954ce08347cce5f 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -45,12 +45,12 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1383 b/tests/data/test1383
index 34f3cf6bc5c1f32db682dd87dbef1490c3f64771..d4c5c8285a6694940c52b34d9bdd31ede6feb129 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -44,12 +44,12 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -69,7 +69,7 @@ mooo
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1384 b/tests/data/test1384
index f27d59a754bf54e04f5f7ec8be610523cd67fe53..af7afdf7663104c5d3abaa32cc7b45ae7154f2dc 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -44,12 +44,12 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1385 b/tests/data/test1385
index e35c674b3a0ab9836bb4dbe0709bec4a6d7252f0..d2038ee9206e190f105c33e62afd3c602359281c 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER
 </postcheck>
 </client>
 
@@ -44,12 +44,12 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 fooo
 mooo
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1386 b/tests/data/test1386
index 471493b44fefeb8c27ff6914de85a582880ba9e7..0aaf6641948ac0e5ab4074c6a85a9e671dcf50fc 100644 (file)
--- a/tests/data/test1386
+++ b/tests/data/test1386
@@ -31,10 +31,10 @@ ftp
 FTP DL, file with Content-Disposition inside, using -o fname
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -52,7 +52,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 MOOOO
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1387 b/tests/data/test1387
index c8f5ae6d7b20ada215bd0fdb2a88f6284329ff78..0f124d870c32e423cb9d06c464d58662d6ea8405 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -52,7 +52,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 MOOOO
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -84,7 +84,7 @@ MOOOO
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1388 b/tests/data/test1388
index 479ca42f022a2dd96927815990806b11ee357465..d78844e77ef83ed45d1cb58d5884502511d31cab 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -52,7 +52,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 MOOOO
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1389 b/tests/data/test1389
index eb35d39f5c901f5c47db852ae8440a1cd5807757..0863a40139f03a74a9db65d1a8a5720b3c4dedc4 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -53,7 +53,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -65,7 +65,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 MOOOO
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -85,7 +85,7 @@ MOOOO
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1390 b/tests/data/test1390
index fc30849d331128210e1b173ca71363dac22c86cb..a856d1e8d641eb7a4cfaba6d9c451d086b3ff7a0 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -J -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -J -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -53,7 +53,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -65,7 +65,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 MOOOO
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1391 b/tests/data/test1391
index ce28e5aa746278fd0c38755fa888293f1ca321a6..ae1495eec9e9d3cf98a95e85a907eeb9fc138b3a 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -52,7 +52,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 MOOOO
 </file1>
 
-<file2 name="log/heads%TESTNUMBER">
+<file2 name="%LOGDIR/heads%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r
@@ -84,7 +84,7 @@ MOOOO
 s/^(229 Entering Passive Mode \().*(\).*)/${1}stripped${2}/
 </stripfile2>
 
-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>
 
 </verify>

diff --git a/tests/data/test1392 b/tests/data/test1392
index 99e13c349389f7eb35b216d48220f3c944e6f16f..f715fe8b3c6f95f5517f744bd33cbb029c234d7a 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i -D -
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i -D -
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -52,7 +52,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 MOOOO
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 220-        _   _ ____  _     \r
 220-    ___| | | |  _ \| |    \r
 220-   / __| | | | |_) | |    \r

diff --git a/tests/data/test1393 b/tests/data/test1393
index 1402eaf4cd79b62e13f3a630a6139ef52b92a960..dc7a6f9341d927a85e5c32b63796a086fcbebd55 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o log/download%TESTNUMBER -i
+ftp://%HOSTIP:%FTPPORT/path/file%TESTNUMBER -o %LOGDIR/download%TESTNUMBER -i
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/file%TESTNUMBER log/name%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/file%TESTNUMBER %LOGDIR/name%TESTNUMBER
 </postcheck>
 </client>
 
@@ -52,7 +52,7 @@ RETR file%TESTNUMBER
 QUIT\r
 </protocol>
 
-<file1 name="log/download%TESTNUMBER">
+<file1 name="%LOGDIR/download%TESTNUMBER">
 HTTP/1.1 200 OK\r
 Date: Tue, 09 Nov 2010 14:49:00 GMT\r
 Server: test-server/fake\r
@@ -64,7 +64,7 @@ Content-Disposition: filename=name%TESTNUMBER; charset=funny; option=strange
 MOOOO
 </file1>
 
-<file2 name="log/stdout%TESTNUMBER">
+<file2 name="%LOGDIR/stdout%TESTNUMBER">
 </file2>
 
 </verify>

diff --git a/tests/data/test1400 b/tests/data/test1400
index a92b2f22e00b76b1eb01ea38616ec3bb51b985fe..837a20b09326115191e0a517c7ef7119375894d3 100644 (file)
--- a/tests/data/test1400
+++ b/tests/data/test1400
@@ -31,7 +31,7 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl log/test%TESTNUMBER.c
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER --libcurl %LOGDIR/test%TESTNUMBER.c
 </command>
 </client>
 
@@ -55,7 +55,7 @@ $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_HTTP09_ALLOWED/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test%TESTNUMBER.c" mode="text">
+<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* 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 bbd3e7b6481a32f5d005985676a118add99c824c..17065459153c59ae5fc73c158ae102e0965b41af 100644 (file)
--- a/tests/data/test1401
+++ b/tests/data/test1401
@@ -40,7 +40,7 @@ file
 SSL_CERT_FILE=
 </setenv>
  <command>
-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"
 </command>
 </client>
 
@@ -65,7 +65,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test%TESTNUMBER.c" mode="text">
+<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* 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 667be124c0296198123dc46e1537fa46362d007f..5003ba8f3e2d752c29e60b5ee8aa20b88e623559 100644 (file)
--- a/tests/data/test1402
+++ b/tests/data/test1402
@@ -32,7 +32,7 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-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"
 </command>
 </client>
 
@@ -58,7 +58,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test%TESTNUMBER.c" mode="text">
+<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* 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 5ecf2d28cc04b06cfbdc96ae6ba38a94b646e323..3eab6222d5917fc6ab38df73d4ef574d495b55eb 100644 (file)
--- a/tests/data/test1403
+++ b/tests/data/test1403
@@ -32,7 +32,7 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-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"
 </command>
 </client>
 
@@ -55,7 +55,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test%TESTNUMBER.c" mode="text">
+<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* 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 ae37c3065b47bda96e0afedfb113e29a2c859fd1..f18ad8a39d75aba0a1a323abda52f40102e58721 100644 (file)
--- a/tests/data/test1404
+++ b/tests/data/test1404
@@ -36,10 +36,10 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-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
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 dummy data
 </file>
 </client>
@@ -101,7 +101,7 @@ $_ = '' if /CURLOPT_INTERLEAVEDATA/
 # CURL_DOES_CONVERSION generates an extra comment.
 $_ = '' if /\/\* "value" \*\//
 </stripfile>
-<file name="log/test%TESTNUMBER.c" mode="text">
+<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* 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 31b7d6971a85c235e0a05a76779c81c2a56f36c9..5bb0450e63248add421aa42829c7b5c52c0252e7 100644 (file)
--- a/tests/data/test1405
+++ b/tests/data/test1405
@@ -36,7 +36,7 @@ ftp
 SSL_CERT_FILE=
 </setenv>
  <command>
-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
 </command>
 </client>
 
@@ -58,7 +58,7 @@ RETR %TESTNUMBER
 NOOP 3\r
 QUIT\r
 </protocol>
-<file name="log/test%TESTNUMBER.c" mode="text">
+<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* 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 0be9bfa61510e5677334fd9dca17eadcbf4cd272..3a00b44db4c7c698807244b40112b1427b7964d4 100644 (file)
--- a/tests/data/test1406
+++ b/tests/data/test1406
@@ -28,14 +28,14 @@ smtp
 <setenv>
 SSL_CERT_FILE=
 </setenv>
-<file name="log/test%TESTNUMBER.eml">
+<file name="%LOGDIR/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
  <command>
-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
 </command>
 </client>
 
@@ -57,7 +57,7 @@ To: another
 body\r
 .\r
 </upload>
-<file name="log/test%TESTNUMBER.c" mode="text">
+<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* 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 d5bfb7f5d3c4f812d97830e9ef8d39eec720b4dd..160c86449e270520302554b965063e9140503a64 100644 (file)
--- a/tests/data/test1407
+++ b/tests/data/test1407
@@ -30,7 +30,7 @@ pop3
 SSL_CERT_FILE=
 </setenv>
 <command>
-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
 </command>
 </client>
 
@@ -44,7 +44,7 @@ PASS secret
 LIST %TESTNUMBER\r
 QUIT\r
 </protocol>
-<file name="log/test%TESTNUMBER.c" mode="text">
+<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* 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 adecc9bf5f48a3c2cdefe2e11ae8e08e62375dfa..e27923ad76a192025cf85862500884648c5bb81a 100644 (file)
--- a/tests/data/test1408
+++ b/tests/data/test1408
@@ -49,7 +49,7 @@ http-ipv6
 HTTP receive cookies over IPV6
  </name>
  <command>
--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
 </command>
 </client>
 

diff --git a/tests/data/test1411 b/tests/data/test1411
index a7d23ee2f16b83a1150d95ad6b83bb76b149f618..47b36f2b91c9b19b807c32fd3b8f7b2ec3d44021 100644 (file)
--- a/tests/data/test1411
+++ b/tests/data/test1411
@@ -36,10 +36,10 @@ http
 HTTP with zero size file PUT
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/empty%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/empty%TESTNUMBER
 </command>
 # create an empty file
-<file name="log/empty%TESTNUMBER">
+<file name="%LOGDIR/empty%TESTNUMBER">
 </file>
 </client>
 

diff --git a/tests/data/test1415 b/tests/data/test1415
index 7d460be236ee5dfc352552c6a74c33828a70b9c4..82f83790a5e03f39eb3748a62e649fdad21146c4 100644 (file)
--- a/tests/data/test1415
+++ b/tests/data/test1415
@@ -44,7 +44,7 @@ Delete expired cookies
 TZ=GMT
 </setenv>
 <command>
-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
 </command>
 <features>
 cookies
@@ -63,7 +63,7 @@ Proxy-Connection: Keep-Alive
 \r
 </protocol>
 
-<file name="log/jar%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
 # 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 a0dd086d57de683fc98ebbcf4fcfde191ec9b640..4400cec0ceb004d3bd848889e0b5dd8af255284a 100644 (file)
--- a/tests/data/test1417
+++ b/tests/data/test1417
@@ -49,7 +49,7 @@ http
 HTTP GET with chunked encoding and chunked trailer without CRs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>
 
@@ -63,7 +63,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/heads%TESTNUMBER">
+<file name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
 Server: fakeit/0.9 fakeitbad/1.0\r
 Transfer-Encoding: chunked\r

diff --git a/tests/data/test1420 b/tests/data/test1420
index 415e35902b4f6400a0f0621a98f1384bb9e99ff9..e6f899f41722b52b23c52675e6586d687a70a977 100644 (file)
--- a/tests/data/test1420
+++ b/tests/data/test1420
@@ -36,7 +36,7 @@ imap
 SSL_CERT_FILE=
 </setenv>
 <command>
-'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
 </command>
 </client>
 
@@ -50,7 +50,7 @@ A003 SELECT %TESTNUMBER
 A004 FETCH 1 BODY[]\r
 A005 LOGOUT\r
 </protocol>
-<file name="log/test%TESTNUMBER.c" mode="text">
+<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* 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 7cd1d1345675eec0c94bb4d37646654b2e5f3e1f..c62c2cbdae419e435e7ff4300847344cb1c68e08 100644 (file)
--- a/tests/data/test1422
+++ b/tests/data/test1422
@@ -37,10 +37,10 @@ http
 HTTP GET with -O -J and Content-Disposition (empty file)
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O file://%PWD/log/name%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -J -O file://%PWD/%LOGDIR/name%TESTNUMBER
 </command>
 </client>
 
@@ -55,7 +55,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/name%TESTNUMBER">
+<file1 name="%LOGDIR/name%TESTNUMBER">
 </file1>
 
 </verify>

diff --git a/tests/data/test1423 b/tests/data/test1423
index 2eb1d8003a7cad8acc4ccb1518fd09e3831f3d32..f269cc0b04c240d0f848d5b33a0b605175f9847a 100644 (file)
--- a/tests/data/test1423
+++ b/tests/data/test1423
@@ -30,10 +30,10 @@ file
 HTTP GET -o fname without Content-Disposition (empty file)
 </name>
 <command option="no-output,no-include">
-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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/notexists.pl log/%TESTNUMBER
+perl %SRCDIR/libtest/notexists.pl %LOGDIR/%TESTNUMBER
 </postcheck>
 </client>
 
@@ -48,7 +48,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 </file1>
 
 </verify>

diff --git a/tests/data/test1424 b/tests/data/test1424
index ebe5f5213b48ecb9a57a661ccc0b63c2775fa727..640582549d80ee4f8f7f0f158e1b4adbcc72746d 100644 (file)
--- a/tests/data/test1424
+++ b/tests/data/test1424
@@ -46,11 +46,11 @@ http
 <name>
 HTTP GET -o fname without Content-Disposition (unmet time condition)
 </name>
-<file name="log/outfile%TESTNUMBER">
+<file name="%LOGDIR/outfile%TESTNUMBER">
 original contents
 </file>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 
@@ -66,7 +66,7 @@ If-Modified-Since: Sun, 12 Dec 1999 11:00:00 GMT
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 original contents
 </file1>
 

diff --git a/tests/data/test1434 b/tests/data/test1434
index 4801ee2c0281dfba0653470930198d962bcead43..75baba7e8263b992983c5afd784a6bb14828453e 100644 (file)
--- a/tests/data/test1434
+++ b/tests/data/test1434
@@ -60,7 +60,7 @@ HTTP GET resume at exactly the existing file size is fine
  <command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -C 100
 </command>
-<file name="log/curl%TESTNUMBER.out">
+<file name="%LOGDIR/curl%TESTNUMBER.out">
 012345678
 012345678
 012345678

diff --git a/tests/data/test1440 b/tests/data/test1440
index e87cafb0816c18ad9eab4321883c7cd92d3aa968..dbdfc73619797c929c82d2f0717a3ff30a83ccf2 100644 (file)
--- a/tests/data/test1440
+++ b/tests/data/test1440
@@ -19,7 +19,7 @@ file
 Check --write-out with trailing %{
 </name>
 <command>
-file://localhost/%PWD/log/non-existent-file.txt --write-out '%{'
+file://localhost/%PWD/%LOGDIR/non-existent-file.txt --write-out '%{'
 </command>
 </client>
 

diff --git a/tests/data/test1441 b/tests/data/test1441
index 8d841df5d45b82853495feae34c47f18a4a1b316..2ff6be036a979a073037aac2b6885a6341d8d991 100644 (file)
--- a/tests/data/test1441
+++ b/tests/data/test1441
@@ -19,7 +19,7 @@ file
 Check --write-out with trailing %
 </name>
 <command>
-file://localhost/%PWD/log/non-existent-file.txt --write-out '%'
+file://localhost/%PWD/%LOGDIR/non-existent-file.txt --write-out '%'
 </command>
 </client>
 

diff --git a/tests/data/test1442 b/tests/data/test1442
index 255a4c9ff09f9cfd4ebcb7a04ce2afed13daba35..02ecea67f6ffe2d59b793fe679c961b233e543b4 100644 (file)
--- a/tests/data/test1442
+++ b/tests/data/test1442
@@ -19,7 +19,7 @@ file
 Check --write-out with trailing \
 </name>
 <command>
-file://localhost/%PWD/log/non-existent-file.txt --write-out '\'
+file://localhost/%PWD/%LOGDIR/non-existent-file.txt --write-out '\'
 </command>
 </client>
 

diff --git a/tests/data/test1443 b/tests/data/test1443
index a59958ae734548f38560e2145ae49e4c51048ecc..bbfaf7f1b893839ba30e6accd620c6e45678b90f 100644 (file)
--- a/tests/data/test1443
+++ b/tests/data/test1443
@@ -37,7 +37,7 @@ http
 HTTP GET with -O and --remote-time
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 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.
 <postcheck>
-perl -e 'exit((stat("log/%TESTNUMBER"))[9] != 960898200)'
+perl -e 'exit((stat("%LOGDIR/%TESTNUMBER"))[9] != 960898200)'
 </postcheck>
 </client>
 
@@ -59,7 +59,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 12345
 </file>
 </verify>

diff --git a/tests/data/test1444 b/tests/data/test1444
index 71b5f0ea0643ca6d243b0b012643193e8c0bdb2b..7d79fbbab226c6f97567abd671d116150513f1c1 100644 (file)
--- 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.
 <postcheck>
-perl -e 'exit((stat("log/curl%TESTNUMBER.out"))[9] != 1234567890)'
+perl -e 'exit((stat("%LOGDIR/curl%TESTNUMBER.out"))[9] != 1234567890)'
 </postcheck>
 </client>
 

diff --git a/tests/data/test1445 b/tests/data/test1445
index 1811e071fe6566acdf3d1bdcd19695566bd6c80e..7fb1d1df6cd96e0b0303ae385945d17cb89b695f 100644 (file)
--- a/tests/data/test1445
+++ b/tests/data/test1445
@@ -15,17 +15,17 @@ FILE
 file
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
  <name>
 file:// with --remote-time
  </name>
  <command>
-file://localhost%FILE_PWD/log/test%TESTNUMBER.dir/plainfile.txt --remote-time
+file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.dir/plainfile.txt --remote-time
 </command>
 <postcheck>
-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)'
 </postcheck>
 </client>
 

diff --git a/tests/data/test1446 b/tests/data/test1446
index 0088375b4335a4e566557d67ee97f208556c96f2..189f0dfa6d202450b46bce21933dfbe252bd4b6d 100644 (file)
--- a/tests/data/test1446
+++ b/tests/data/test1446
@@ -18,17 +18,17 @@ SFTP
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP with --remote-time
  </name>
  <command>
---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
 </command>
 <postcheck>
-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)'
 </postcheck>
 </client>
 

diff --git a/tests/data/test1459 b/tests/data/test1459
index e8c2b00c52b70653b827718e65ece3f1154b4898..2a69a60330e500849fd8dafb49aae32d5dfc7cb5 100644 (file)
--- a/tests/data/test1459
+++ b/tests/data/test1459
@@ -13,7 +13,7 @@ known_hosts
 sftp
 </server>
 <precheck>
-mkdir -p %PWD/log/test%TESTNUMBER.dir/.ssh
+mkdir -p %PWD/%LOGDIR/test%TESTNUMBER.dir/.ssh
 </precheck>
 <features>
 sftp
@@ -25,12 +25,12 @@ SFTP with corrupted known_hosts
  <command>
 -u : sftp://%HOSTIP:%SSHPORT/ -l
 </command>
-<file name="log/test%TESTNUMBER.dir/.ssh/known_hosts">
+<file name="%LOGDIR/test%TESTNUMBER.dir/.ssh/known_hosts">
 |1|qy29Y1x/+/F39AzdG5515YSSw+c=|iB2WX5jrU3ZTWc+ZfGau7HHEvBc= ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAynDN8cDJ3xNzRjTNNGciSHSxpubxhZ6YnkLdp1TkrGW8n\
 R93Ey5VtBeBblYTRlFXBWJgKFcTKBRJ/O4qBZwbUgt10AHj31i6h8NehfT19tR8wG/YCmj3KtYLHmwdzmW1edEL9G2NdX2KiKYv7/zuly3QvmP0QA0NhWkAz0KdWNM=
 </file>
 <setenv>
-CURL_HOME=%PWD/log/test%TESTNUMBER.dir
+CURL_HOME=%PWD/%LOGDIR/test%TESTNUMBER.dir
 </setenv>
 </client>
 

diff --git a/tests/data/test1460 b/tests/data/test1460
index 8f6b5f29371ad130ddfdf6a25ea569b1312aa4a8..c3180ff9232fe6e601612a497d999b0e72f0796e 100644 (file)
--- a/tests/data/test1460
+++ b/tests/data/test1460
@@ -34,12 +34,12 @@ http
 HTTP GET with -Ji and Content-Disposition with existing file
 </name>
 <setenv>
-CURL_TESTDIR=%PWD/log
+CURL_TESTDIR=%LOGDIR
 </setenv>
 <command option="no-output,no-include">
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Ji -O
 </command>
-<file name="log/name%TESTNUMBER">
+<file name="%LOGDIR/name%TESTNUMBER">
 initial content
 </file>
 </client>
@@ -51,7 +51,7 @@ initial content
 <errorcode>
 2
 </errorcode>
-<file name="log/name%TESTNUMBER">
+<file name="%LOGDIR/name%TESTNUMBER">
 initial content
 </file>
 

diff --git a/tests/data/test1465 b/tests/data/test1465
index 1a28fb1c3f29961ca7230d6af6d2a51a3bca6ad4..341237d24ef6d41ac92e3a8ab4e8557a6c4f9751 100644 (file)
--- a/tests/data/test1465
+++ b/tests/data/test1465
@@ -32,10 +32,10 @@ http
 SSL_CERT_FILE=
 </setenv>
  <command>
-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
 </command>
 # "ab\x81""cd\0e\\\"?\r\n\t\x01""fghi%x1Ajklm%xFD"
-<file name="log/%TESTNUMBER-upload" nonewline="yes">
+<file name="%LOGDIR/%TESTNUMBER-upload" nonewline="yes">
 %hex[ab%81cd%00e\"?%0D%0A%09%01fghi%1Ajklm%FD]hex%
 </file>
 </client>
@@ -61,7 +61,7 @@ $_ = '' if /CURLOPT_SSH_KNOWNHOSTS/
 $_ = '' if /CURLOPT_HTTP_VERSION/
 $_ = '' if /CURLOPT_INTERLEAVEDATA/
 </stripfile>
-<file name="log/test%TESTNUMBER.c" mode="text">
+<file name="%LOGDIR/test%TESTNUMBER.c" mode="text">
 /********* 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 5161c39bbed4c94671446f5bb8b1b1d2ef807fb2..f2b3882cb2c0bcff175ba86068a3fe19357f4190 100644 (file)
--- a/tests/data/test1469
+++ b/tests/data/test1469
@@ -16,7 +16,7 @@ none
 Space in FTP upload URL
  </name>
  <command>
-"ftp://%HOSTIP:%NOLISTENPORT/%TESTNUMBER%/with space/" -T log/irrelevant-file
+"ftp://%HOSTIP:%NOLISTENPORT/%TESTNUMBER%/with space/" -T %LOGDIR/irrelevant-file
 </command>
 </client>
 

diff --git a/tests/data/test149 b/tests/data/test149
index 94ca5f793cccfb70a80acc06724ccd14d7e6252a..e01c3f12801966be0c557c8ecf5086d04ebf097e 100644 (file)
--- a/tests/data/test149
+++ b/tests/data/test149
@@ -18,9 +18,9 @@ ftp
 FTP with multiple uploads
  </name>
  <command>
--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
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 send away this contents
 </file>
 </client>
@@ -46,7 +46,7 @@ EPSV
 STOR %TESTNUMBER\r
 QUIT\r
 </protocol>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 send away this contents
 </file>
 </verify>

diff --git a/tests/data/test1506 b/tests/data/test1506
index 07d3aac99eb4cb2a08e370732d57d4d707854d2d..2cad631ba5dc9fbb558fdadc78f3c88106d06569 100644 (file)
--- a/tests/data/test1506
+++ b/tests/data/test1506
@@ -82,7 +82,7 @@ Accept: */*
 <strip>
 ^Host:.*
 </strip>
-<file name="log/stderr%TESTNUMBER" mode="text">
+<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
 * 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 02cb90a671e59d24f6d5a1f43baa80ad1a0705d5..78ff18fb3df7eeab0093135c32139952981c029f 100644 (file)
--- 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"
 <verify>
-<file name="log/stdout%TESTNUMBER">
+<file name="%LOGDIR/stdout%TESTNUMBER">
 We are done
 </file>
 </verify>

diff --git a/tests/data/test1509 b/tests/data/test1509
index baa0a30ca9d3efac143de736b410fc4f7a07c3da..5bf55cb633e4afe3b4d778313d9735f85aa4e8cf 100644 (file)
--- a/tests/data/test1509
+++ b/tests/data/test1509
@@ -62,7 +62,7 @@ simple multi http:// through proxytunnel with authentication info
  <command>
 http://the.old.moo.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test1510 b/tests/data/test1510
index d021dfee679f085bee70753fa9aa493a5bb76fd1..eccbb6c94295203b2d7793347efced5eaa7354db 100644 (file)
--- a/tests/data/test1510
+++ b/tests/data/test1510
@@ -82,7 +82,7 @@ Accept: */*
 <strip>
 ^Host:.*
 </strip>
-<file name="log/stderr%TESTNUMBER" mode="text">
+<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
 * 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 65831ddc5d326cc5255a2314f89a572acc4a5e9e..b5ac86610bd5f60b3cbcabd1f120cc2a7c560e23 100644 (file)
--- a/tests/data/test1524
+++ b/tests/data/test1524
@@ -45,9 +45,9 @@ http
 HTTP PUT with 303 redirect
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -T log/upload%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/blah/%TESTNUMBER -L -T %LOGDIR/upload%TESTNUMBER.txt
 </command>
-<file name="log/upload%TESTNUMBER.txt">
+<file name="%LOGDIR/upload%TESTNUMBER.txt">
 moo
 </file>
 </client>

diff --git a/tests/data/test154 b/tests/data/test154
index 0b180b90a90085c7abb72262a27d0fc6739d98f0..a05eb8aea5667061ffa3aeca844df923698b7df3 100644 (file)
--- a/tests/data/test154
+++ b/tests/data/test154
@@ -67,9 +67,9 @@ crypto
 HTTP PUT with --anyauth authorization (picking Digest)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put%TESTNUMBER">
+<file name="%LOGDIR/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three

diff --git a/tests/data/test1542 b/tests/data/test1542
index cead5a0e87556ae65e38f4e7d4ba966cfdb3287b..d9fece4166995238be41f41c6edc0ea8879aec4a 100644 (file)
--- a/tests/data/test1542
+++ b/tests/data/test1542
@@ -54,7 +54,7 @@ Host: %HOSTIP:%HTTPPORT
 Accept: */*\r
 \r
 </protocol>
-<file name="log/stderr%TESTNUMBER" mode="text">
+<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
 == 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 353edb9fa84048fdf7828ccfd8f5ea17d20431ea..83aed115f8f864d26f1ae1c4c3e1b1e064b0e21d 100644 (file)
--- a/tests/data/test155
+++ b/tests/data/test155
@@ -84,9 +84,9 @@ http
 HTTP PUT with --anyauth authorization (picking NTLM)
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put%TESTNUMBER">
+<file name="%LOGDIR/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three

diff --git a/tests/data/test1558 b/tests/data/test1558
index 26854c2dde0f2944d7909d115c383f10e635b806..46332d198c69e305b0dffa5d5b85e8adf809da6d 100644 (file)
--- a/tests/data/test1558
+++ b/tests/data/test1558
@@ -24,9 +24,9 @@ lib%TESTNUMBER
 CURLINFO_PROTOCOL for file:// transfer
 </name>
 <command>
-file://%FILE_PWD/log/data%TESTNUMBER
+file://%FILE_PWD/%LOGDIR/data%TESTNUMBER
 </command>
-<file name="log/data%TESTNUMBER">
+<file name="%LOGDIR/data%TESTNUMBER">
 hello
 </file>
 </client>

diff --git a/tests/data/test156 b/tests/data/test156
index 35de74d24054f89f58c8dc251ea6542408608676..214b5396eed16f745bd9a75e0c3336bcfee52153 100644 (file)
--- a/tests/data/test156
+++ b/tests/data/test156
@@ -28,9 +28,9 @@ http
 HTTP PUT with --anyauth (when the server requires none)
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --anyauth
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --anyauth
 </command>
-<file name="log/put%TESTNUMBER">
+<file name="%LOGDIR/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three

diff --git a/tests/data/test1561 b/tests/data/test1561
index 908b31c2965da56e623b85f7dc1828185e4370f3..7dbce1108b18ab52aa08357518ca5eb3dc1340c5 100644 (file)
--- a/tests/data/test1561
+++ b/tests/data/test1561
@@ -72,7 +72,7 @@ https
 Cookies set over HTTP can't override secure ones
 </name>
 <command>
--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"
 </command>
 </client>
 <verify>
@@ -88,7 +88,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/jar%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
 # 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 b954c2aeab5d493726eff99552f6538745ba48b3..be047dcebb5722299e3730bc3625621b35b80287 100644 (file)
--- 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
 </name>
 <command option="no-output,no-include">
-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
 </command>
-<file name="log/etag%TESTNUMBER">
+<file name="%LOGDIR/etag%TESTNUMBER">
 "123456"
 </file>
-<file1 name="log/output%TESTNUMBER">
+<file1 name="%LOGDIR/output%TESTNUMBER">
 downloaded already
 </file1>
 
@@ -56,7 +56,7 @@ If-None-Match: "123456"
 </protocol>
 
 # verify that the target file is untouched
-<file name="log/output%TESTNUMBER">
+<file name="%LOGDIR/output%TESTNUMBER">
 downloaded already
 </file>
 </verify>

diff --git a/tests/data/test163 b/tests/data/test163
index b763c3ca8957564bac3f7faeb96f6535bf873d9d..45af183605c8d112af717a19e414529873bd28fc 100644 (file)
--- a/tests/data/test163
+++ b/tests/data/test163
@@ -30,10 +30,10 @@ http
 HTTP multipart formpost with contents from a file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=<log/field%TESTNUMBER" -F tool=curl
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=<%LOGDIR/field%TESTNUMBER" -F tool=curl
 </command>
 # We create this file before the command is invoked!
-<file name="log/field%TESTNUMBER">
+<file name="%LOGDIR/field%TESTNUMBER">
 contents
 from
 a

diff --git a/tests/data/test1654 b/tests/data/test1654
index ef6657494cf87fa3d8b880c802d274302cd0619d..3bd6f65c0130448ae56445543f8d7b6ad2a91775 100644 (file)
--- a/tests/data/test1654
+++ b/tests/data/test1654
@@ -24,9 +24,9 @@ CURL_TIME=1548369261
 alt-svc
 </name>
 <command>
-log/%TESTNUMBER
+%LOGDIR/%TESTNUMBER
 </command>
-<file name="log/%TESTNUMBER" mode="text">
+<file name="%LOGDIR/%TESTNUMBER" mode="text">
 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
 </file>
 </client>
 <verify>
-<file name="log/%TESTNUMBER-out" mode="text">
+<file name="%LOGDIR/%TESTNUMBER-out" mode="text">
 # 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 bcbf377555cf1e862acf9ecc83c4a5d4850b263c..40892a87fd88c820ef2c3d7730d985acd014a5f7 100644 (file)
--- a/tests/data/test166
+++ b/tests/data/test166
@@ -30,10 +30,10 @@ http
 HTTP formpost a file with spaces in name
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=@log/fie ld %TESTNUMBER"
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F "name=@%LOGDIR/fie ld %TESTNUMBER"
 </command>
 # We create this file before the command is invoked!
-<file name="log/fie ld %TESTNUMBER">
+<file name="%LOGDIR/fie ld %TESTNUMBER">
 data inside the file
 </file>
 </client>

diff --git a/tests/data/test1660 b/tests/data/test1660
index cbbcf7587ce621f3493fa9d9409d3318615aa667..e21fec47520b45efe7fdaa42ec17f63dddfa5739 100644 (file)
--- a/tests/data/test1660
+++ b/tests/data/test1660
@@ -15,7 +15,7 @@ unittest
 HSTS
 </features>
 
-<file name="log/input%TESTNUMBER">
+<file name="%LOGDIR/input%TESTNUMBER">
 # 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
 </stdout>
-<file name="log/hsts%TESTNUMBER" mode="text">
+<file name="%LOGDIR/hsts%TESTNUMBER" mode="text">
 # 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 6d8722f618d184180caca91dfdc5aa894e421926..34d79f766fce93d9fdd031baf6627dcd8878efba 100644 (file)
--- a/tests/data/test1670
+++ b/tests/data/test1670
@@ -40,7 +40,7 @@ http
 -w individual header output
 </name>
 <command option="no-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
 </command>
 </client>
 

diff --git a/tests/data/test1671 b/tests/data/test1671
index 09b4155129ab556c32f35b2c324c2241db5be253..43753b527de363a919b714b281214a167ec22884 100644 (file)
--- a/tests/data/test1671
+++ b/tests/data/test1671
@@ -43,7 +43,7 @@ http
 -w header JSON output
 </name>
 <command option="no-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
 </command>
 </client>
 

diff --git a/tests/data/test1680 b/tests/data/test1680
index 7d8167c0e27ec19ce0e718d67e7c700c367b192e..4775a411b0fe1df39f7102163e4b4b9481c6a996 100644 (file)
--- a/tests/data/test1680
+++ b/tests/data/test1680
@@ -33,9 +33,9 @@ http
 http
 </features>
 <command option="no-output">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/exist%TESTNUMBER --clobber
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/exist%TESTNUMBER --clobber
 </command>
-<file name="log/exist%TESTNUMBER">
+<file name="%LOGDIR/exist%TESTNUMBER">
 to be overwritten
 </file>
 </client>
@@ -43,7 +43,7 @@ to be overwritten
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/exist%TESTNUMBER">
+<file name="%LOGDIR/exist%TESTNUMBER">
 HTTP/1.0 200 OK
 Connection: close
 Content-Type: text/plain

diff --git a/tests/data/test1681 b/tests/data/test1681
index cfc8a5db81a62727415680bc5a4bf9beb0837d5b..16c0d8c5055f873b8ecf94ebfff71d129bd42757 100644 (file)
--- a/tests/data/test1681
+++ b/tests/data/test1681
@@ -33,9 +33,9 @@ http
 http
 </features>
 <command option="no-output">
-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'
 </command>
-<file name="log/exist%TESTNUMBER">
+<file name="%LOGDIR/exist%TESTNUMBER">
 to stay the same
 </file>
 </client>
@@ -43,10 +43,10 @@ to stay the same
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/exist%TESTNUMBER">
+<file name="%LOGDIR/exist%TESTNUMBER">
 to stay the same
 </file>
-<file1 name="log/exist%TESTNUMBER.1">
+<file1 name="%LOGDIR/exist%TESTNUMBER.1">
 HTTP/1.0 200 OK
 Connection: close
 Content-Type: text/plain
@@ -55,7 +55,7 @@ Content-Length: 4
 foo
 </file1>
 <stdout mode="text">
-log/exist%TESTNUMBER.1
+%LOGDIR/exist%TESTNUMBER.1
 </stdout>
 </verify>
 </testcase>

diff --git a/tests/data/test1682 b/tests/data/test1682
index e981c20e95213f26bf03a2fa87080b2287ed501b..b5462ab05b24ce8b6d44a448ef2337fc3d07ffe0 100644 (file)
--- a/tests/data/test1682
+++ b/tests/data/test1682
@@ -33,9 +33,9 @@ http
 http
 </features>
 <command option="no-output">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER --output-dir log -o exist%TESTNUMBER --no-clobber
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --output-dir %LOGDIR -o exist%TESTNUMBER --no-clobber
 </command>
-<file name="log/exist%TESTNUMBER">
+<file name="%LOGDIR/exist%TESTNUMBER">
 to stay the same
 </file>
 </client>
@@ -43,10 +43,10 @@ to stay the same
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/exist%TESTNUMBER">
+<file name="%LOGDIR/exist%TESTNUMBER">
 to stay the same
 </file>
-<file1 name="log/exist%TESTNUMBER.1">
+<file1 name="%LOGDIR/exist%TESTNUMBER.1">
 HTTP/1.0 200 OK
 Connection: close
 Content-Type: text/plain

diff --git a/tests/data/test1683 b/tests/data/test1683
index 93d27d73c66e03a77bbcc5ee06f8da43eb81e47a..178b4054dc11d8d5d3134e5a8a2531b71a7ca660 100644 (file)
--- a/tests/data/test1683
+++ b/tests/data/test1683
@@ -33,18 +33,18 @@ http
 http
 </features>
 <command option="no-output">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/exist%TESTNUMBER --no-clobber
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/exist%TESTNUMBER --no-clobber
 </command>
-<file name="log/exist%TESTNUMBER">
+<file name="%LOGDIR/exist%TESTNUMBER">
 to stay the same
 </file>
 <precheck>
-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")'
 </precheck>
 <postcheck>
-perl -e 'for my $i ((1..100)) { my $filename = "log/exist%TESTNUMBER.$i"; open(FH, "<", $filename) or die $!; (<FH> eq "to stay the same" and <FH> 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 $!; (<FH> eq "to stay the same" and <FH> 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"'
 </postcheck>
 </client>
 
@@ -54,7 +54,7 @@ perl -e 'for my $i ((1..100)) { my $filename = "log/exist%TESTNUMBER.$i"; open(F
 <errorcode>
 23
 </errorcode>
-<file name="log/exist%TESTNUMBER">
+<file name="%LOGDIR/exist%TESTNUMBER">
 to stay the same
 </file>
 </verify>

diff --git a/tests/data/test1703 b/tests/data/test1703
index a6a4d9fe15b7c1b1dacfe91809dc9905885f5873..bdc647632380272ad3650309a339656a4be6e2b2 100644 (file)
--- a/tests/data/test1703
+++ b/tests/data/test1703
@@ -28,9 +28,9 @@ win32
 basic file:// file with UTF-8 characters
 </name>
 <command option="no-include">
-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
 </command>
-<file name="log/テスト%TESTNUMBER.txt">
+<file name="%LOGDIR/テスト%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test171 b/tests/data/test171
index dc46fe287c20374db211640aeffe59e750ff76f5..d56296f4e6e74666fa9e7e3055ed8a9ce8ec6920 100644 (file)
--- a/tests/data/test171
+++ b/tests/data/test171
@@ -31,7 +31,7 @@ http
 HTTP, get cookie with dot prefixed full domain
  </name>
  <command>
--c log/jar%TESTNUMBER -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER
+-c %LOGDIR/jar%TESTNUMBER -x %HOSTIP:%HTTPPORT http://z.x.com/%TESTNUMBER
 </command>
 <features>
 cookies
@@ -49,7 +49,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
-<file name="log/jar%TESTNUMBER" mode="text">
+<file name="%LOGDIR/jar%TESTNUMBER" mode="text">
 # 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 276856ae0f3cc5d0b649fdc9b382d0df0f31dc63..bf4871931da864c0c198b7bd406c98ac774078eb 100644 (file)
--- a/tests/data/test172
+++ b/tests/data/test172
@@ -27,9 +27,9 @@ http
 HTTP with cookies file and custom added cookie
  </name>
  <command>
-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"
 </command>
-<file name="log/jar%TESTNUMBER.txt">
+<file name="%LOGDIR/jar%TESTNUMBER.txt">
 # 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 61c633440faffa4406062085687e43c2cee5b2cc..4bfceb1ac4074bdaa06fe87b1b47777cd11adfa3 100644 (file)
--- a/tests/data/test179
+++ b/tests/data/test179
@@ -31,9 +31,9 @@ http
 HTTP using proxy and cookies with path checks
  </name>
  <command>
-http://supertrooper.fake/c/%TESTNUMBER -b log/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT
+http://supertrooper.fake/c/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -x %HOSTIP:%HTTPPORT
 </command>
-<file name="log/injar%TESTNUMBER">
+<file name="%LOGDIR/injar%TESTNUMBER">
 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 32ecd00a9a17ebe80d484167736d5e73197c57a5..dcb616fd0523ff1522ec938cc7d3f58457346704 100644 (file)
--- a/tests/data/test180
+++ b/tests/data/test180
@@ -27,9 +27,9 @@ http
 HTTP 1.0 PUT
  </name>
  <command>
-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
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 Weird
      file
          to

diff --git a/tests/data/test181 b/tests/data/test181
index f496c29469a415e4406f6aa248390aa07118ae4a..71dd427bf43bd931085cd214e872862c22e0ba24 100644 (file)
--- a/tests/data/test181
+++ b/tests/data/test181
@@ -27,9 +27,9 @@ http
 HTTP 1.0 POST
  </name>
  <command>
-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
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 Weird
      file
          to

diff --git a/tests/data/test1903 b/tests/data/test1903
index 16704e893c1acd6bc256d8042db1667de40cf402..5a4d3e0a500a3b09e1f8a2bb7b8bae7d300fcdf6 100644 (file)
--- a/tests/data/test1903
+++ b/tests/data/test1903
@@ -35,7 +35,7 @@ lib%TESTNUMBER
 <command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER
 </command>
-<file name="log/cookies%TESTNUMBER" mode="text">
+<file name="%LOGDIR/cookies%TESTNUMBER" mode="text">
 # 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 7a19e68b7f209e0418a3d1e754434d608173cebc..cf2498ff939cb7fe3a6f13c765b035e4d8a82161 100644 (file)
--- a/tests/data/test1905
+++ b/tests/data/test1905
@@ -48,7 +48,7 @@ Host: %HOSTIP:%HTTPPORT
 Accept: */*\r
 \r
 </protocol>
-<file name="log/cookies%TESTNUMBER" mode="text">
+<file name="%LOGDIR/cookies%TESTNUMBER" mode="text">
 # 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 0ac0e8626f65a6d4899785708f14fe70af8459c7..69058a20867f002ddf738c462ad064b848872539 100644 (file)
--- a/tests/data/test1908
+++ b/tests/data/test1908
@@ -72,7 +72,7 @@ Accept: */*
 # matches
 s/\"([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-%TESTNUMBER" mode="text">
+<file name="%LOGDIR/altsvc-%TESTNUMBER" mode="text">
 # 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 64e7b0526e6d60c14529b3c4520a84c06165951a..c412d41e06acc35cba74adc64a5cabc26dfd6e23 100644 (file)
--- a/tests/data/test1909
+++ b/tests/data/test1909
@@ -36,7 +36,7 @@ http
 HTTP GET --retry-all-errors to overcome partial transfer
  </name>
  <command option="no-output,no-include">
---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
 </command>
 </client>
 
@@ -56,7 +56,7 @@ Accept: */*
 \r
 </protocol>
 
-<file1 name="log/outfile%TESTNUMBER">
+<file1 name="%LOGDIR/outfile%TESTNUMBER">
 data
 </file1>
 

diff --git a/tests/data/test200 b/tests/data/test200
index e7c5146f7711709871d330fd782b77ae91e9ec26..7ce2cbcfeafe2c011a817add5416629b8ca567fe 100644 (file)
--- a/tests/data/test200
+++ b/tests/data/test200
@@ -24,9 +24,9 @@ file
 basic file:// file
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test%TESTNUMBER.txt
+file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test2000 b/tests/data/test2000
index 32604c6f31b617cdf9461f6eaa3fcd43e56f548e..b114dd8affba0ee2337098a0021d2ad0e9b08bf7 100644 (file)
--- a/tests/data/test2000
+++ b/tests/data/test2000
@@ -32,9 +32,9 @@ file
 FTP RETR followed by FILE
  </name>
 <command option="no-include">
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER file://localhost%FILE_PWD/log/test%TESTNUMBER.txt
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test2001 b/tests/data/test2001
index e85fd1ffc2540e728aa528c39449ab3a5895e005..f1e71467539fbb2266f9df6e76ef0ecd8476d2f1 100644 (file)
--- a/tests/data/test2001
+++ b/tests/data/test2001
@@ -49,9 +49,9 @@ file
 HTTP GET followed by FTP RETR followed by FILE
  </name>
 <command option="no-include">
-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
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test2002 b/tests/data/test2002
index 2cd28016b902f7223f334af15fa5b80ae366eaa5..1616cade1778b925f951c5dc2b31b1337862d051 100644 (file)
--- 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
  </name>
 <command option="no-include">
-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
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test2003 b/tests/data/test2003
index a1d5a9fc22a5ff9a9bca9c5b509b8d038d6f48a0..8af42538b9977cc4c1a8c4cd19f3c73ceefb3997 100644 (file)
--- 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
  </name>
 <command option="no-include">
-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
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test2004 b/tests/data/test2004
index 17a73167ae5c34a6eaf7fe7f140f01e1c4e50c4a..9f41ce76c9384e08a906d19f51926f5bd3728e05 100644 (file)
--- 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
  </name>
 <command option="no-include">
---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
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 This is test data
 for several protocols
 </file>

diff --git a/tests/data/test201 b/tests/data/test201
index 8e9f190b78e7a1d10468e67a85da836fbf1556fe..b68abb8c00537bd810309fc7276637f6a6c75ee2 100644 (file)
--- a/tests/data/test201
+++ b/tests/data/test201
@@ -21,7 +21,7 @@ file
 missing file:// file
  </name>
  <command>
-file://localhost/%PWD/log/non-existent-file.txt
+file://localhost/%PWD/%LOGDIR/non-existent-file.txt
 </command>
 </client>
 

diff --git a/tests/data/test202 b/tests/data/test202
index f5efc07328f2bfabc062247488f3672ef09a90eb..f2fb078f21865305077de5d4965307c58c77840f 100644 (file)
--- a/tests/data/test202
+++ b/tests/data/test202
@@ -20,9 +20,9 @@ file
 two file:// URLs to stdout
  </name>
 <command option="no-include">
-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
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 contents in a single file
 </file>
 </client>

diff --git a/tests/data/test203 b/tests/data/test203
index d1935638413613bdbe0a1b0b4580bc28b8f0ac9b..496a4148253c6934bd676adc8b4c23d023d84873 100644 (file)
--- a/tests/data/test203
+++ b/tests/data/test203
@@ -29,9 +29,9 @@ file:/path URL with a single slash
 MSYS2_ARG_CONV_EXCL=file:
 </setenv>
 <command option="no-include">
-file:%FILE_PWD/log/test%TESTNUMBER.txt
+file:%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test2039 b/tests/data/test2039
index a10852a7fc5853e065c11e0d96f66d37f1a0524f..25ecf278a628152229fccff8be160ef830f68def 100644 (file)
--- 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
  </name>
  <command>
---netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 # 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 dcf0bb5bda67ce0e2750ea50233644c1f4ed4328..63d17cd57dad8ad17ac1e5ba00efabbb57912af3 100644 (file)
--- a/tests/data/test204
+++ b/tests/data/test204
@@ -16,9 +16,9 @@ file
 "upload" with file://
  </name>
 <command option="no-include">
-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
 </command>
-<file name="log/upload%TESTNUMBER.txt">
+<file name="%LOGDIR/upload%TESTNUMBER.txt">
 data
 in
 file
@@ -29,7 +29,7 @@ write
 
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/result%TESTNUMBER.txt">
+<file name="%LOGDIR/result%TESTNUMBER.txt">
 data
 in
 file

diff --git a/tests/data/test205 b/tests/data/test205
index de04997c3f47a5ef79c4a0c2e2e4c42fee268be3..e2165ccd10b74d2dc54b4b30b613ae3a8a5aae70 100644 (file)
--- a/tests/data/test205
+++ b/tests/data/test205
@@ -17,9 +17,9 @@ file
 "upload" with file://
  </name>
 <command option="no-include">
-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
 </command>
-<file name="log/upload%TESTNUMBER.txt">
+<file name="%LOGDIR/upload%TESTNUMBER.txt">
 data
 in
 file

diff --git a/tests/data/test2058 b/tests/data/test2058
index ba4a53e8440b77757057729d2cdb2ad46d854e28..7561c28fc4aae7a003d595dc51323719f5d197a6 100644 (file)
--- 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
  </name>
  <command>
-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
 </command>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 test
 </file>
 </client>

diff --git a/tests/data/test2059 b/tests/data/test2059
index 4776970d32dd563eddbbf0a2b30b75553a01e2f2..0bd5be8c9707be854d484fcf3888363b206824ce 100644 (file)
--- 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
  </name>
  <command>
-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
 </command>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 test
 </file>
 </client>

diff --git a/tests/data/test2060 b/tests/data/test2060
index 9a8057d514a450f403f3d9f4e8d99f7187bfeb5f..85637157be9c0f4de23076bad08930ea89bdd039 100644 (file)
--- 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
  </name>
  <command>
-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
 </command>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 test
 </file>
 </client>

diff --git a/tests/data/test2071 b/tests/data/test2071
index 900f0d5a89fbb9f7d8b303bdd0b08c0dedfbc038..45ee91737d5be7a2ab13894835df87e54bf24a49 100644 (file)
--- a/tests/data/test2071
+++ b/tests/data/test2071
@@ -24,9 +24,9 @@ file
 basic file:// file with "127.0.0.1" hostname
  </name>
 <command option="no-include">
-file://127.0.0.1%FILE_PWD/log/test2070.txt
+file://127.0.0.1%FILE_PWD/%LOGDIR/test2070.txt
 </command>
-<file name="log/test2070.txt">
+<file name="%LOGDIR/test2070.txt">
 foo
    bar
 bar

diff --git a/tests/data/test2072 b/tests/data/test2072
index 179167068ea9afdf6ffde71957783151ca5165e7..50cb4b60a6f2cc0d2cb074ddb73127700d2b16b7 100644 (file)
--- 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
 </name>
 <command option="no-include">
-file:////%PWD/log/test%TESTNUMBER.txt
+file:////%PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>
 <precheck>
 perl -e "print 'Test requires a unix system' if ( $^O eq 'MSWin32' || $^O eq 'cygwin' || $^O eq 'dos' || $^O eq 'msys');"
 </precheck>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test208 b/tests/data/test208
index a6c0eea492f17e0e62536c69813ae948bc12a632..f3ad620ee9fd61a0fb195b1ce75750a3451d764b 100644 (file)
--- 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
  </name>
  <command>
--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
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 Weird
      file
          to

diff --git a/tests/data/test2080 b/tests/data/test2080
index 9c8d538fc896b486e19301f84ffabbeb539bc9f3..8b92c4f13a58f7302b936c65422433253918b38d 100644 (file)
Binary files a/tests/data/test2080 and b/tests/data/test2080 differ

diff --git a/tests/data/test216 b/tests/data/test216
index 0e74110b19b10963d0a5442f4ca8cc6049e867be..82629f5915a72f119684ca4fb6b8d611bbe5e962 100644 (file)
--- a/tests/data/test216
+++ b/tests/data/test216
@@ -18,9 +18,9 @@ ftp
 FTP upload two files to the same dir
  </name>
  <command>
--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
 </command>
-<file name="log/upload.%TESTNUMBER">
+<file name="%LOGDIR/upload.%TESTNUMBER">
 upload this file twice
 </file>
 </client>

diff --git a/tests/data/test218 b/tests/data/test218
index 08ee8c6d45bde7aa8c057019ac59cbbc7e71a4b0..3b67095bf0aa8fccd7f9dfcd4af6119f0f1e3b96 100644 (file)
--- a/tests/data/test218
+++ b/tests/data/test218
@@ -29,9 +29,9 @@ http
 HTTP PUT from a file but enforce chunked transfer-encoding
  </name>
  <command>
- -T log/file%TESTNUMBER -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+ -T %LOGDIR/file%TESTNUMBER -H "Transfer-Encoding: chunked" http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
-<file name="log/file%TESTNUMBER">
+<file name="%LOGDIR/file%TESTNUMBER">
 just some tiny teeny contents
 </file>
 </client>

diff --git a/tests/data/test2205 b/tests/data/test2205
index 9bc8d3207e1780de4614d61c4d00a47a4569395b..da6f1ddafa87b11f4bb816da1403ae2c007297ec 100644 (file)
--- a/tests/data/test2205
+++ b/tests/data/test2205
@@ -25,11 +25,11 @@ mqtt
 <name>
 MQTT with very long user name
 </name>
-<file name="log/input%TESTNUMBER">
+<file name="%LOGDIR/input%TESTNUMBER">
 user = %repeat[65536 x a]%:fakepasswd
 </file>
 <command option="binary-trace">
-mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -K log/input%TESTNUMBER
+mqtt://%HOSTIP:%MQTTPORT/%TESTNUMBER -K %LOGDIR/input%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test2305 b/tests/data/test2305
index 7293db36c3c2b4f35b5ffab19b5bad8e49deb882..869f6d36b2c01d486e2f910af599f1885ec8c7f0 100644 (file)
--- a/tests/data/test2305
+++ b/tests/data/test2305
@@ -44,13 +44,13 @@ WebSocket curl_ws_recv() loop reading three larger frames
 lib%TESTNUMBER
 </tool>
 <command>
-ws://%HOSTIP:%HTTPPORT/%TESTNUMBER log/save%TESTNUMBER
+ws://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/save%TESTNUMBER
 </command>
 </client>
 
 #
 <verify>
-<file name="log/save%TESTNUMBER">
+<file name="%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 c925eb15188499a35297865312c61c2877696f77..64bafa1763a729364fde3385078e62a4db689fd0 100644 (file)
--- a/tests/data/test231
+++ b/tests/data/test231
@@ -23,9 +23,9 @@ file
 file:// with resume
  </name>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test%TESTNUMBER.txt -C 10
+file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt -C 10
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 A01234567
 B01234567
 C01234567

diff --git a/tests/data/test235 b/tests/data/test235
index e1f2a2f1ee22b3cf91d53a564601ae5c03e02585..3ff27cf2611c5e56d51d35c22e512232faa4fd4f 100644 (file)
--- a/tests/data/test235
+++ b/tests/data/test235
@@ -21,9 +21,9 @@ ftp
 FTP resumed upload but no file present remotely
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -C -
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 this is the *****crap******** that we're gonna upload
 
 worx?

diff --git a/tests/data/test236 b/tests/data/test236
index 3a89add7fd1ed18d41c91e7590145d02665b98ce..6f59e643e3bfd5029bb02db7ad157685beebe7f5 100644 (file)
--- a/tests/data/test236
+++ b/tests/data/test236
@@ -24,9 +24,9 @@ ftp
 FTP resume upload but denied access to remote file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/file%TESTNUMBER.txt -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/file%TESTNUMBER.txt -C -
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 </file>
 </client>

diff --git a/tests/data/test24 b/tests/data/test24
index bbd5f039475377f8df513cfd2d0f3c7f55e86588..c275bfd0120cc0f621ad5796c652baa28b607e3e 100644 (file)
--- a/tests/data/test24
+++ b/tests/data/test24
@@ -41,7 +41,7 @@ Accept: */*
 <errorcode>
 22
 </errorcode>
-<file2 name="log/stderr%TESTNUMBER" mode="text">
+<file2 name="%LOGDIR/stderr%TESTNUMBER" mode="text">
 curl: (22) The requested URL returned error: 404
 </file2>
 </verify>

diff --git a/tests/data/test2402 b/tests/data/test2402
index 82d16733d7b23afb1370107898a81af4ddb68ccf..57a26b970bcf5901c49abaf75c5f03e8b971a763 100644 (file)
--- a/tests/data/test2402
+++ b/tests/data/test2402
@@ -96,7 +96,7 @@ Via: 2 nghttpx
 <strip>
 ^Host:.*
 </strip>
-<file name="log/stderr%TESTNUMBER" mode="text">
+<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
 * 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 7e79d39117d1de18cdf9ebfdfc3c040bfaa077b3..d51034c9e304659332aaa89550f43169721ed3d8 100644 (file)
--- a/tests/data/test247
+++ b/tests/data/test247
@@ -19,7 +19,7 @@ ftp
  <name>
 FTP upload time condition evaluates TRUE => skip upload
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
-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"
 </command>
 </client>
 

diff --git a/tests/data/test248 b/tests/data/test248
index 8881c99d57d9c2b9c699344a9cca6d34213d56a7..4d4c1a69e9fedcf7a21bfac1d2b395f7071cc0ce 100644 (file)
--- a/tests/data/test248
+++ b/tests/data/test248
@@ -19,7 +19,7 @@ ftp
  <name>
 FTP upload time condition evaluates FALSE => upload anyway
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
-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"
 </command>
 </client>
 

diff --git a/tests/data/test2502 b/tests/data/test2502
index 0e2ec09b0479982df200e97c0b865f06f93c12f7..5e4a0fd0b366e0cfbf00caf4ef14d864d0ccfb16 100644 (file)
--- a/tests/data/test2502
+++ b/tests/data/test2502
@@ -91,7 +91,7 @@ Via: 3 nghttpx
 <strip>
 ^Host:.*
 </strip>
-<file name="log/stderr%TESTNUMBER" mode="text">
+<file name="%LOGDIR/stderr%TESTNUMBER" mode="text">
 * 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 6816bb768d2f37753715f29b7a73c5c1ab68656e..cbb8714649f0c9b1ff8f6b5c72014413e84f240c 100644 (file)
--- a/tests/data/test256
+++ b/tests/data/test256
@@ -29,9 +29,9 @@ http
 HTTP resume request over proxy with auth without server supporting it
  </name>
  <command option="no-output">
--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
 </command>
-<file name="log/fewl%TESTNUMBER.txt">
+<file name="%LOGDIR/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
@@ -57,7 +57,7 @@ Proxy-Connection: Keep-Alive
 </protocol>
 
 # the download target file must remain untouched
-<file name="log/fewl%TESTNUMBER.txt">
+<file name="%LOGDIR/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>

diff --git a/tests/data/test257 b/tests/data/test257
index 701abb777de7404e0adbb0b5dc4972c041a14d32..ac38ac5fbdb939be13b89bd01aac4dfe658ed0c1 100644 (file)
--- a/tests/data/test257
+++ b/tests/data/test257
@@ -71,13 +71,13 @@ http
 HTTP Location: following with --netrc-optional
  </name>
  <command>
-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
 </command>
 <features>
 proxy
 </features>
 # netrc auth for two out of three sites:
-<file name="log/netrc%TESTNUMBER">
+<file name="%LOGDIR/netrc%TESTNUMBER">
 machine supersite.com login user1 password passwd1
 machine anotherone.com login user2 password passwd2
 </file>

diff --git a/tests/data/test258 b/tests/data/test258
index 748980007f39fcad04faff7d84359dfde1bfc1fe..3587b57a9d8b2d95f99c23f03f2d876e20120290 100644 (file)
--- a/tests/data/test258
+++ b/tests/data/test258
@@ -65,10 +65,10 @@ proxy
 HTTP POST multipart without Expect: header using proxy anyauth (Digest)
  </name>
  <command>
--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
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar

diff --git a/tests/data/test259 b/tests/data/test259
index 9f64cca1258c51f83edeb481174ba941148416a9..cc09c5b17db998bfc35f7d498b690a4f719daeef 100644 (file)
--- a/tests/data/test259
+++ b/tests/data/test259
@@ -61,10 +61,10 @@ proxy
 HTTP POST multipart with Expect: header using proxy anyauth (Digest)
  </name>
  <command>
--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"
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar

diff --git a/tests/data/test266 b/tests/data/test266
index 09cca480c695689944899dadc05fcaa42ecdbb08..d30c70aac6a1dba5071e9fe3cd9cf870461f1176 100644 (file)
--- a/tests/data/test266
+++ b/tests/data/test266
@@ -53,7 +53,7 @@ http
 HTTP GET with chunked Transfer-Encoding and chunked trailer
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D log/heads%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -D %LOGDIR/heads%TESTNUMBER
 </command>
 </client>
 
@@ -67,7 +67,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/heads%TESTNUMBER">
+<file name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!\r
 Server: fakeit/0.9 fakeitbad/1.0\r
 Transfer-Encoding: chunked\r

diff --git a/tests/data/test281 b/tests/data/test281
index f92b753af2728804d37112207a8492e912a41cd6..06ca27b7c3a99040a59e02aad4abe83905d91dff 100644 (file)
--- 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
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -f -T log/test%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -f -T %LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 Weird
      file
          to

diff --git a/tests/data/test285 b/tests/data/test285
index ab055e416faa37c190c70d69cc3464da957b58e9..1b76d19396f8373430110571f3822ebbf942941e 100644 (file)
--- a/tests/data/test285
+++ b/tests/data/test285
@@ -16,9 +16,9 @@ tftp
 TFTP send
  </name>
  <command>
--T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//
+-T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 a chunk of
 data
 sent

diff --git a/tests/data/test286 b/tests/data/test286
index febd5e3fb5a93b6237cc03b7fdfc4f846a2dd412..4ba0bcdeb6f15b247d4295d3c1462062872e590e 100644 (file)
--- a/tests/data/test286
+++ b/tests/data/test286
@@ -16,9 +16,9 @@ tftp
 TFTP send of boundary case 512 byte file
  </name>
  <command>
--T log/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//
+-T %LOGDIR/test%TESTNUMBER.txt tftp://%HOSTIP:%TFTPPORT//
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 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 6ee19d41dfd6116da5e2365f9fa1c209ff380961..164cf20e76160efcbdd8d02c8263564fde94cb93 100644 (file)
--- 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/
 </setenv>
 <command option="no-include">
-file://localhost%FILE_PWD/log/test%TESTNUMBER.txt
+file://localhost%FILE_PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test289 b/tests/data/test289
index 481eacf819d86ba668e926be998990b7f2c609bb..4b80c908cb8964b1f6c02974f515d215aa247de2 100644 (file)
--- a/tests/data/test289
+++ b/tests/data/test289
@@ -17,7 +17,7 @@ ftp
 FTP resume upload but denied access to local file
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/illegal-nonexistent-file -C -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/illegal-nonexistent-file -C -
 </command>
 </client>
 

diff --git a/tests/data/test3008 b/tests/data/test3008
index 31aa4f766b27ce8883a6049c1df9596abac0ae5f..51afb047e8c65ac827900074a4e715c25ee25a74 100644 (file)
--- a/tests/data/test3008
+++ b/tests/data/test3008
@@ -36,7 +36,7 @@ http
 --output-dir
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/log
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -O --output-dir %PWD/%LOGDIR
 </command>
 </client>
 
@@ -50,7 +50,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 -foo-
 </file>
 </verify>

diff --git a/tests/data/test3011 b/tests/data/test3011
index c282cdb782c3ca767a4fcc81177e14ee403e3300..f5b2f1d8c651455ceeab016ae0d7c57d98f5a2c1 100644 (file)
--- a/tests/data/test3011
+++ b/tests/data/test3011
@@ -36,7 +36,7 @@ http
 --output-dir with --create-dirs
 </name>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 
@@ -50,7 +50,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/tmp/%TESTNUMBER">
+<file name="%LOGDIR/tmp/%TESTNUMBER">
 -foo-
 </file>
 </verify>

diff --git a/tests/data/test3012 b/tests/data/test3012
index 1889c937e300ad64c2c1b318f74a1f2b7bdaafa5..2bd329455c43661f8bd2160138b9fa5fd9fc2bdd 100644 (file)
--- a/tests/data/test3012
+++ b/tests/data/test3012
@@ -39,7 +39,7 @@ http
 --output-dir with -J
 </name>
 <command option="no-output,no-include">
-http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -OJ --output-dir %PWD/log
+http://%HOSTIP:%HTTPPORT/this/is/the/%TESTNUMBER -OJ --output-dir %PWD/%LOGDIR
 </command>
 </client>
 
@@ -53,7 +53,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/MMM%TESTNUMBERMMM">
+<file name="%LOGDIR/MMM%TESTNUMBERMMM">
 -foo-
 </file>
 </verify>

diff --git a/tests/data/test3013 b/tests/data/test3013
index 9c0ce445c18e6e715df33e8c4e264e0c1de26b2b..183667e6823cf994db927c4d09ee7c1f70830817 100644 (file)
--- a/tests/data/test3013
+++ b/tests/data/test3013
@@ -39,7 +39,7 @@ http
 Two --output-dir with --next in between
 </name>
 <command option="no-output,no-include">
-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
 </command>
 </client>
 
@@ -58,10 +58,10 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 -foo-
 </file>
-<file2 name="log/second%TESTNUMBER">
+<file2 name="%LOGDIR/second%TESTNUMBER">
 -foo-
 </file2>
 </verify>

diff --git a/tests/data/test3021 b/tests/data/test3021
index 775dd91f827ac24f55560f2575c6ba3445c7d0f3..b2dcfdc9acba38e4293c82d20aa179949a483736 100644 (file)
--- a/tests/data/test3021
+++ b/tests/data/test3021
@@ -28,14 +28,14 @@ sftp
 SFTP correct sha256 host key
  </name>
  <command>
---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
 </command>
 <setenv>
 # 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=*
 </setenv>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 test
 </file>
 </client>

diff --git a/tests/data/test3022 b/tests/data/test3022
index a9dbcb0f2b71ff34a0850231ae5020c5961cf962..fe558c3d51aea8df7a40387b3ff953d1b89919eb 100644 (file)
--- a/tests/data/test3022
+++ b/tests/data/test3022
@@ -28,14 +28,14 @@ scp
 SCP correct sha256 host key
  </name>
  <command>
---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
 </command>
 <setenv>
 # 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=*
 </setenv>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 test
 </file>
 </client>

diff --git a/tests/data/test3029 b/tests/data/test3029
index a5bc14be456c64040c84fcb952845fcb1b1efa79..2e51bbeaf40b3b5265519de5b6d71e581a57807a 100644 (file)
--- a/tests/data/test3029
+++ b/tests/data/test3029
@@ -23,12 +23,12 @@ http
 HTTP with multiple -D
 </name>
 <command>
--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
 </command>
 </client>
 
 <verify>
-<file name="log/heads%TESTNUMBER">
+<file name="%LOGDIR/heads%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 b4d7ee38dbd11bed7aeadf3eb59fc43c1d9a2ab3..7e169cf43a63ba1cbf7ab693a6ff4fd532e3ae66 100644 (file)
--- a/tests/data/test3030
+++ b/tests/data/test3030
@@ -23,12 +23,12 @@ http
 HTTP with multiple transfers in one -D
 </name>
 <command>
--D log/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
+-D %LOGDIR/heads%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
 </client>
 
 <verify>
-<file name="log/heads%TESTNUMBER">
+<file name="%LOGDIR/heads%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 b632af74fc62f20317797d34f1f8a3139f300812..1f6bafb9e93808e4186bf48bc9d80646efa0a007 100644 (file)
--- a/tests/data/test304
+++ b/tests/data/test304
@@ -31,10 +31,10 @@ https
 HTTPS multipart formpost
  </name>
  <command>
--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
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 </file>
 </client>

diff --git a/tests/data/test31 b/tests/data/test31
index ad71792d4aca481b1f488949e12b9b2a0c8f78dc..6fe4910d1b7562960cc1b3608189db1b590b1ffb 100644 (file)
--- a/tests/data/test31
+++ b/tests/data/test31
@@ -128,7 +128,7 @@ HTTP with weirdly formatted cookies and cookiejar storage
 TZ=GMT
 </setenv>
  <command>
-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
 </command>
 <precheck>
 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: */*\r
 \r
 </protocol>
-<file name="log/jar%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
 # 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 88f99ccdeea04eb2ac7485809a3f13b28af2194e..77f684b04b1cae0be462d174883705dd1806c8a0 100644 (file)
--- a/tests/data/test320
+++ b/tests/data/test320
@@ -58,7 +58,7 @@ simple TLS-SRP HTTPS GET, check user in response
 <verify>
 <protocol>
 </protocol>
-<file name="log/curl%TESTNUMBER.out">
+<file name="%LOGDIR/curl%TESTNUMBER.out">
 HTTP/1.0 200 OK\r
 Content-type: text/html\r
 \r

diff --git a/tests/data/test327 b/tests/data/test327
index 0014b1fe5adbb3e82f9124004a1f436e3a34e3bc..19d7c0fb23ddf91be5bc07dadf02a11bf974763b 100644 (file)
--- a/tests/data/test327
+++ b/tests/data/test327
@@ -43,7 +43,7 @@ http
 HTTP with cookiejar without cookies left
  </name>
  <command>
-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
 </command>
 <features>
 cookies
@@ -65,7 +65,7 @@ Accept: */*
 Cookie: foobar=name\r
 \r
 </protocol>
-<file name="log/cookies%TESTNUMBER" mode="text">
+<file name="%LOGDIR/cookies%TESTNUMBER" mode="text">
 # 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 5d3d26338d7a9e9240a82eb340d996d2327453ed..1f03d3ce5f82ee29da3791087bc48b4613af42fe 100644 (file)
--- a/tests/data/test329
+++ b/tests/data/test329
@@ -31,10 +31,10 @@ moo
 
 # Client-side
 <client>
-<file name="log/jar%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
 .host.foo.com  TRUE    /we/want/       FALSE   2147483647      test    no
 </file>
-<file name="log/jar%TESTNUMBER-2.txt" mode="text">
+<file name="%LOGDIR/jar%TESTNUMBER-2.txt" mode="text">
 .host.foo.com  TRUE    /we/want/       FALSE   2147483647      tester  yes
 </file>
 <server>
@@ -50,7 +50,7 @@ HTTP cookie with Max-Age=0
 TZ=GMT
 </setenv>
  <command>
-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
 </command>
 <features>
 cookies

diff --git a/tests/data/test33 b/tests/data/test33
index 56024842cca43ca3e190cae9750918dea04c4c55..bd02e008853e9de055f56da79402f2778bf8cc24 100644 (file)
--- a/tests/data/test33
+++ b/tests/data/test33
@@ -23,7 +23,7 @@ http
  <name>
 HTTP PUT with resume
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 012345678
 012345678
 012345678
@@ -36,7 +36,7 @@ HTTP PUT with resume
 012345678
 </file>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -Tlog/test%TESTNUMBER.txt -C 50
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T%LOGDIR/test%TESTNUMBER.txt -C 50
 </command>
 </client>
 

diff --git a/tests/data/test339 b/tests/data/test339
index 8d5b90bdbd0a91bf53ad559247cabe1899a853c8..8c43402757c6a3f6a0601434a6b1de85225085c7 100644 (file)
--- a/tests/data/test339
+++ b/tests/data/test339
@@ -39,7 +39,7 @@ http
 Check if --etag-save saved correct etag to a file
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save log/etag%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER
 </command>
 </client>
 
@@ -53,7 +53,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/etag%TESTNUMBER">
+<file name="%LOGDIR/etag%TESTNUMBER">
 W/"asdf"
 </file>
 </verify>

diff --git a/tests/data/test341 b/tests/data/test341
index 3c9f72ae5fae9396ed834986707912251c0a6a87..4ebee11fcc3903b307d673f695c4183754b6190e 100644 (file)
--- 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
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test342 b/tests/data/test342
index ca8957a5f03291cfad25180099352c41746916b3..79f60256350c37144264ea18d20e1ce09f710cb4 100644 (file)
--- a/tests/data/test342
+++ b/tests/data/test342
@@ -33,11 +33,11 @@ http
 <name>
 Check if --etag-compare set correct etag in header
 </name>
-<file name="log/etag%TESTNUMBER">
+<file name="%LOGDIR/etag%TESTNUMBER">
 "21025-dc7-39462498"
 </file>
 <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare log/etag%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-compare %LOGDIR/etag%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test343 b/tests/data/test343
index faf6c9a5ed8cb1ad37a82e7facd9b794b1ee8350..dd13708ce895135812a3cb85e9a8e545bb6f68b7 100644 (file)
--- a/tests/data/test343
+++ b/tests/data/test343
@@ -33,11 +33,11 @@ http
 <name>
 Both --etag-compare and --etag-save to save new Etag
 </name>
-<file name="log/etag%TESTNUMBER">
+<file name="%LOGDIR/etag%TESTNUMBER">
 "21025-dc7-39462498"
 </file>
 <command>
-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
 </command>
 </client>
 
@@ -52,7 +52,7 @@ Accept: */*
 If-None-Match: "21025-dc7-39462498"\r
 \r
 </protocol>
-<file name="log/out%TESTNUMBER">
+<file name="%LOGDIR/out%TESTNUMBER">
 "21025-dc7-11111"
 </file>
 </verify>

diff --git a/tests/data/test344 b/tests/data/test344
index ec671d492008cb2a9d2c048056df72eac20adbbe..197c00489bdbf08c330cd59a80407b85503998d9 100644 (file)
--- 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
 </name>
 <command>
-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
 </command>
 </client>
 
@@ -49,7 +49,7 @@ Accept: */*
 If-None-Match: ""\r
 \r
 </protocol>
-<file name="log/etag%TESTNUMBER">
+<file name="%LOGDIR/etag%TESTNUMBER">
 "21025-dc7-11111"
 </file>
 </verify>

diff --git a/tests/data/test345 b/tests/data/test345
index 5619d4475a294f70d852692c38d74bd3214f4d50..c6da676a83d8ff66098be6c4d1d995e3dc3dff96 100644 (file)
--- a/tests/data/test345
+++ b/tests/data/test345
@@ -33,11 +33,11 @@ http
 <name>
 Both --etag-compare and -save store new Etag using one pre-existing file
 </name>
-<file name="log/etag%TESTNUMBER">
+<file name="%LOGDIR/etag%TESTNUMBER">
 "21025-dc7-39462498"
 </file>
 <command>
-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
 </command>
 </client>
 
@@ -52,7 +52,7 @@ Accept: */*
 If-None-Match: "21025-dc7-39462498"\r
 \r
 </protocol>
-<file name="log/etag%TESTNUMBER">
+<file name="%LOGDIR/etag%TESTNUMBER">
 "21025-dc7-11111"
 </file>
 </verify>

diff --git a/tests/data/test347 b/tests/data/test347
index ef85d9d2c0a01feeb13008d5a784f7a2528eb745..606335c0d060c9ec9045ed78ae9a4a68cf939b67 100644 (file)
--- a/tests/data/test347
+++ b/tests/data/test347
@@ -39,7 +39,7 @@ http
 --etag-save with blank incoming header
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save log/etag%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --etag-save %LOGDIR/etag%TESTNUMBER
 </command>
 </client>
 
@@ -53,7 +53,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/etag%TESTNUMBER">
+<file name="%LOGDIR/etag%TESTNUMBER">
 </file>
 </verify>
 

diff --git a/tests/data/test348 b/tests/data/test348
index 8832a38104766618d9c72c7a246e1778e9c5c91a..c9aa2cec495cd782f50d7ff490e0aae85a79f68c 100644 (file)
--- a/tests/data/test348
+++ b/tests/data/test348
@@ -21,7 +21,7 @@ ftp
  <name>
 FTP upload file with 552 disk full response
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
       see
@@ -30,7 +30,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 </client>
 

diff --git a/tests/data/test35 b/tests/data/test35
index b5feb199842548e1a345ccdd87931cbf3b7123da..33e6eac73f71ea9faa3830c62498bb611d327a0e 100644 (file)
Binary files a/tests/data/test35 and b/tests/data/test35 differ

diff --git a/tests/data/test355 b/tests/data/test355
index 98e59079a2b0662f783e986b4424ee50e5b0736d..8b32c92e7864f39db16c47d75df416e4b4967fca 100644 (file)
--- a/tests/data/test355
+++ b/tests/data/test355
@@ -36,7 +36,7 @@ load Alt-Svc from file and use
  <command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc ""
 </command>
-<file name="log/altsvc-%TESTNUMBER">
+<file name="%LOGDIR/altsvc-%TESTNUMBER">
 h1 example.com 80 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
 </file>
 </client>

diff --git a/tests/data/test356 b/tests/data/test356
index b1dd349884c6d8151d35d25086cc7e8e00a7eedd..2597f15e88b72b1742b0b82f84d884f7d36e30c4 100644 (file)
--- a/tests/data/test356
+++ b/tests/data/test356
@@ -43,7 +43,7 @@ parse incoming Alt-Svc and save to file
 CURL_ALTSVC_HTTP="yeah"
 </setenv>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "log/altsvc-%TESTNUMBER"
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --alt-svc "%LOGDIR/altsvc-%TESTNUMBER"
 </command>
 </client>
 
@@ -62,7 +62,7 @@ Accept: */*
 # matches
 s/\"([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-%TESTNUMBER" mode="text">
+<file name="%LOGDIR/altsvc-%TESTNUMBER" mode="text">
 # 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 4c204f60ef799d76eb4d00261bc2ac23d8e8983d..4a7e6dc4018f43c29ad068407510bb0b1c42ae35 100644 (file)
--- a/tests/data/test357
+++ b/tests/data/test357
@@ -51,10 +51,10 @@ http
 HTTP PUT with Expect: 100-continue and 417 response
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
 # 1053700 x 'x', large enough to invoke the 100-continue behaviour
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 %repeat[1053700 x x]%
 </file>
 </client>

diff --git a/tests/data/test358 b/tests/data/test358
index 0f8a9801bbcb58d3f352126f8d1ec531c3c1d48e..47afc582cbbd84c334089f88d065240dab947d8d 100644 (file)
--- 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"
 </setenv>
  <command>
---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"
 </command>
-<file name="log/altsvc-%TESTNUMBER">
+<file name="%LOGDIR/altsvc-%TESTNUMBER">
 h2 %HOSTIP %HTTPPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0
 </file>
 
@@ -85,7 +85,7 @@ s/^server: nghttpx.*\r?\n//
 # matches
 s/\"2([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-%TESTNUMBER" mode="text">
+<file name="%LOGDIR/altsvc-%TESTNUMBER" mode="text">
 # 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 0e684e39e5aa503139ab473c610504bb8f4a7ada..9b466b773274b5ff04c392cc27d40a7811c1483e 100644 (file)
--- 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"
 </setenv>
  <command>
---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"
 </command>
-<file name="log/altsvc-%TESTNUMBER">
+<file name="%LOGDIR/altsvc-%TESTNUMBER">
 h2 %HOSTIP %HTTPSPORT h2 %HOSTIP %HTTP2PORT "20290222 22:19:28" 0 0
 </file>
 
@@ -85,7 +85,7 @@ s/^server: nghttpx.*\r?\n//
 # matches
 s/\"2([^\"]*)\"/TIMESTAMP/
 </stripfile>
-<file name="log/altsvc-%TESTNUMBER" mode="text">
+<file name="%LOGDIR/altsvc-%TESTNUMBER" mode="text">
 # 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 ad852c224f7994214e55a7ecda5da5c92f4088a2..900761931028444da51250bc1c2ac14ed20764f6 100644 (file)
--- a/tests/data/test362
+++ b/tests/data/test362
@@ -15,7 +15,7 @@ ftp
  <name>
 FTP resume upload file with nothing to start from
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
       see
@@ -24,7 +24,7 @@ works
   so does it?
 </file>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T log/test%TESTNUMBER.txt --continue-at -
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt --continue-at -
 </command>
 </client>
 

diff --git a/tests/data/test364 b/tests/data/test364
index a5c92659031658eca2157b70f2a622014dad2543..627bc3170b955f513d6b747ee74cabf8d7cc8e5a 100644 (file)
--- a/tests/data/test364
+++ b/tests/data/test364
@@ -28,9 +28,9 @@ https
 HTTPS PUT of small file
  </name>
  <command>
--k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -T log/test%TESTNUMBER.txt
+-k https://%HOSTIP:%HTTPSPORT/we/want/%TESTNUMBER -T %LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 %repeat[200 x banana]%
 </file>
 </client>

diff --git a/tests/data/test369 b/tests/data/test369
index e1e2b32da22c19da5f268293486cc19250431fa3..17a6b4480adf2670c326931541b40db950028731 100644 (file)
--- a/tests/data/test369
+++ b/tests/data/test369
@@ -29,7 +29,7 @@ http
 --etag-save with bad path then working transfer
 </name>
 <command>
-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
 </command>
 </client>
 

diff --git a/tests/data/test370 b/tests/data/test370
index 8a5af1e057776df8cb2b5eea97506ae356dbded3..671e35f6350c3054d76161fa6b74ae203591e154 100644 (file)
--- a/tests/data/test370
+++ b/tests/data/test370
@@ -22,7 +22,7 @@ none
 --etag-save with bad path - no transfer
 </name>
 <command>
-http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --etag-save log/nowhere/etag%TESTNUMBER
+http://%HOSTIP:%NOLISTENPORT/%TESTNUMBER --etag-save %LOGDIR/nowhere/etag%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test371 b/tests/data/test371
index 3a44db575a0400ddc9b1b7c19ac8771e1279babe..83ea5c73bab30b76e4f7f7ddc1b371986df398f1 100644 (file)
--- a/tests/data/test371
+++ b/tests/data/test371
@@ -35,7 +35,7 @@ http
 using more -o than URLs in the command line
  </name>
  <command>
-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
 </command>
 </client>
 

diff --git a/tests/data/test376 b/tests/data/test376
index 34924c7ec6c816d0f16dcc3a71825572f55f0dd5..8d15ec092851e4a32eedbdf2d78e9ec9df6650e6 100644 (file)
--- a/tests/data/test376
+++ b/tests/data/test376
@@ -35,7 +35,7 @@ http
 --remove-on-error
  </name>
  <command option="no-output">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/save-%TESTNUMBER --remove-on-error
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save-%TESTNUMBER --remove-on-error
 </command>
 </client>
 
@@ -58,7 +58,7 @@ Accept: */*
 </protocol>
 
 # the file should be empty now
-<file name="log/save-%TESTNUMBER">
+<file name="%LOGDIR/save-%TESTNUMBER">
 </file>
 </verify>
 </testcase>

diff --git a/tests/data/test378 b/tests/data/test378
index 650e7d4e1733f93b21b13b08eb0a90582a38b485..ca908b7aa04e2984ec9e979fc522a4a728a684f4 100644 (file)
--- a/tests/data/test378
+++ b/tests/data/test378
@@ -21,7 +21,7 @@ none
 Reject using -T and -d at once
  </name>
  <command>
--T log/%TESTNUMBER -d input http://never-accessed
+-T %LOGDIR/%TESTNUMBER -d input http://never-accessed
 </command>
 </client>
 

diff --git a/tests/data/test379 b/tests/data/test379
index c7ffc17144c0155fc74a77e537386402675ea030..491d815c081eadb6e0c76facf0d6edf18cdfcc8d 100644 (file)
--- a/tests/data/test379
+++ b/tests/data/test379
@@ -28,7 +28,7 @@ Funny-head: yesyes
 #
 # Client-side
 <client>
-<file name="log/save">
+<file name="%LOGDIR/save">
 exists before command runs
 </file>
 <server>
@@ -38,7 +38,7 @@ http
 --remove-on-error with --no-clobber and an added number
  </name>
  <command option="no-output">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/save --remove-on-error --no-clobber
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/save --remove-on-error --no-clobber
 </command>
 </client>
 
@@ -61,11 +61,11 @@ Accept: */*
 </protocol>
 
 # this file should be untouched
-<file name="log/save">
+<file name="%LOGDIR/save">
 exists before command runs
 </file>
 # the file should be empty now
-<file2 name="log/save.1">
+<file2 name="%LOGDIR/save.1">
 </file2>
 </verify>
 </testcase>

diff --git a/tests/data/test38 b/tests/data/test38
index 0558700d152962e36a5a3430b7dc1adca4c3bcd7..da352d75d6216fa92e441a189c5b78b2931a3b60 100644 (file)
--- a/tests/data/test38
+++ b/tests/data/test38
@@ -28,9 +28,9 @@ http
 HTTP resume request without server supporting it
  </name>
  <command option="no-output">
-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
 </command>
-<file name="log/fewl%TESTNUMBER.txt">
+<file name="%LOGDIR/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>
@@ -51,7 +51,7 @@ Accept: */*
 </protocol>
 
 # the download target file must remain untouched
-<file name="log/fewl%TESTNUMBER.txt">
+<file name="%LOGDIR/fewl%TESTNUMBER.txt">
 This text is here to simulate a partly downloaded file to resume
 download on.
 </file>

diff --git a/tests/data/test380 b/tests/data/test380
index a1849c178dabd89c57894b8afc16ecc64b5e2afa..bd0c69765c6665d946f5daa7051fbc86f89b89d7 100644 (file)
--- a/tests/data/test380
+++ b/tests/data/test380
@@ -38,9 +38,9 @@ pick netrc password based on user name in URL
 </name>
 
 <command>
---netrc --netrc-file log/netrc%TESTNUMBER ftp://mary@%HOSTIP:%FTPPORT/
+--netrc --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 # 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 c44fa74bccbb89906f4f97f017dbbead978ed44e..902cc91d156b014c34d639137728ad53482d6ecb 100644 (file)
--- a/tests/data/test381
+++ b/tests/data/test381
@@ -42,9 +42,9 @@ netrc-optional lets URL creds override netrc
 </name>
 
 <command>
---netrc-optional --netrc-file log/netrc%TESTNUMBER ftp://mary:drfrank@%HOSTIP:%FTPPORT/
+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://mary:drfrank@%HOSTIP:%FTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 # 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 f48e639f8c51b400950f5c6bfe97c162b528109f..5bfb2265c8fa1da190f70d76e38753b5eef1ffdd 100644 (file)
--- a/tests/data/test39
+++ b/tests/data/test39
@@ -29,10 +29,10 @@ http
 HTTP RFC1867-type formposting with filename= and type=
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@log/test%TESTNUMBER.txt;type=moo/foobar;filename=fakerfile" -F file2=@log/test%TESTNUMBER.txt -F "file3=@\"log/test%TESTNUMBER.txt\";type=mo/foo;filename=\"f\\\\\\\\ak\\\\\\er,\\\\an\\d;.t\\\"xt\"" -F 'file4=@"log/test%TESTNUMBER.txt"; filename="A\\AA\"\"\\\"ZZZ"'
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -F name=daniel -F tool=curl --form-string "str1=@literal" --form-string "str2=<verbatim;type=xxx/yyy" -F "file=@%LOGDIR/test%TESTNUMBER.txt;type=moo/foobar;filename=fakerfile" -F file2=@%LOGDIR/test%TESTNUMBER.txt -F "file3=@\"%LOGDIR/test%TESTNUMBER.txt\";type=mo/foo;filename=\"f\\\\\\\\ak\\\\\\er,\\\\an\\d;.t\\\"xt\"" -F 'file4=@"%LOGDIR/test%TESTNUMBER.txt"; filename="A\\AA\"\"\\\"ZZZ"'
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo bar
 This is a bar foo
 bar

diff --git a/tests/data/test390 b/tests/data/test390
index 80e8c2b708842b58bcb7870d469092295fd7a8a8..83f1cec422e647a8df397435b5116872cdc03015 100644 (file)
--- a/tests/data/test390
+++ b/tests/data/test390
@@ -27,7 +27,7 @@ Content-Type: text/html
 #
 # Client-side
 <client>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 %repeat[1000 x hellofile!]%
 </file>
 <server>
@@ -38,7 +38,7 @@ ftp
 curl HTTP, FILE and FTP in parallel
 </name>
 <command option="no-output">
-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
 </command>
 </client>
 

diff --git a/tests/data/test399 b/tests/data/test399
index da4bae5fde5a369b665bcb1434653f13c24c1bfd..da4b3f7cf79a43727c254078d05e22818a6b2696 100644 (file)
--- a/tests/data/test399
+++ b/tests/data/test399
@@ -15,11 +15,11 @@ http
 <name>
 65536 bytes long host name in URL
 </name>
-<file name="log/input%TESTNUM">
+<file name="%LOGDIR/input%TESTNUM">
 url = http://%repeat[65536 x a]%/399
 </file>
 <command>
--K log/input%TESTNUM
+-K %LOGDIR/input%TESTNUM
 </command>
 </client>
 

diff --git a/tests/data/test401 b/tests/data/test401
index ac4af97724e9d955418b0a819f966dbdd335dcbc..043b660e68d00f5cb05ce2342cd18a1d01710382 100644 (file)
--- a/tests/data/test401
+++ b/tests/data/test401
@@ -19,7 +19,7 @@ ftps
  <name>
 FTPS PASV upload file
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
--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
 </command>
 </client>
 

diff --git a/tests/data/test408 b/tests/data/test408
index 2516fc3323f71b1d020b4edf1b138df485989ac7..676ec9d81bf44a2e2d020c63c892d80df5bb15e2 100644 (file)
--- a/tests/data/test408
+++ b/tests/data/test408
@@ -25,9 +25,9 @@ ftps
 FTPS PORT upload with CWD
  </name>
  <command>
--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 -
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>

diff --git a/tests/data/test409 b/tests/data/test409
index ea6e79560969741670811ff7eb9df7609f797194..4160a11ab7f76466c1f1566131c534ac0c2ac9e5 100644 (file)
--- a/tests/data/test409
+++ b/tests/data/test409
@@ -19,7 +19,7 @@ ftps
  <name>
 FTPS PASV upload file
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
       see
@@ -28,7 +28,7 @@ works
   so does it?
 </file>
  <command>
--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
 </command>
 </client>
 

diff --git a/tests/data/test410 b/tests/data/test410
index 06999fbaa4ef0a0f7f0d3b6ea4a6e8ed7488289d..4fec0b731d49cd479522faf5ffe55919367d8a8e 100644 (file)
--- a/tests/data/test410
+++ b/tests/data/test410
@@ -32,11 +32,11 @@ https
 HTTPS GET with very long request header
  </name>
 # 14 characters repeated 3500 times makes 49000 bytes
-<file name="log/file%TESTNUMBER">
+<file name="%LOGDIR/file%TESTNUMBER">
 Long: %repeat[3500 x header content]%
 </file>
  <command>
--k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -H @log/file%TESTNUMBER
+-k https://%HOSTIP:%HTTPSPORT/%TESTNUMBER -H @%LOGDIR/file%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test411 b/tests/data/test411
index 912f07c6c43f072c949305dba7167d20e6666166..eb6fad1bc60fb76bccb2001dd7ee4321cfcd15d1 100644 (file)
--- a/tests/data/test411
+++ b/tests/data/test411
@@ -20,7 +20,7 @@ none
 -K with missing file causes error
  </name>
  <command>
--K log/missing http://localhost
+-K %LOGDIR/missing http://localhost
 </command>
 </client>
 
@@ -28,7 +28,7 @@ none
 # Verify data after the test has been "shot"
 <verify>
 <stderr mode="text">
-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 0dbc0cea2852850bfc27628e24eda3320f8c73c6..3f740f168937fc2c8c1a77e51e29d315da45ee8a 100644 (file)
--- 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"
 </setenv>
  <command>
---alt-svc "log/altsvc-%TESTNUMBER" "http://whohoo.:12345/%TESTNUMBER"
+--alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://whohoo.:12345/%TESTNUMBER"
 </command>
-<file name="log/altsvc-%TESTNUMBER">
+<file name="%LOGDIR/altsvc-%TESTNUMBER">
 h1 whohoo 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
 </file>
 

diff --git a/tests/data/test413 b/tests/data/test413
index 975b3e37cb3ff88e4db03b5c7e8b3f85cacabfab..cfb7a729765623461f8bebfc1b56e9db23e5582e 100644 (file)
--- 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"
 </setenv>
  <command>
---alt-svc "log/altsvc-%TESTNUMBER" "http://whohoo:12345/%TESTNUMBER"
+--alt-svc "%LOGDIR/altsvc-%TESTNUMBER" "http://whohoo:12345/%TESTNUMBER"
 </command>
-<file name="log/altsvc-%TESTNUMBER">
+<file name="%LOGDIR/altsvc-%TESTNUMBER">
 h1 whohoo. 12345 h1 %HOSTIP %HTTPPORT "20290222 22:19:28" 0 0
 </file>
 

diff --git a/tests/data/test414 b/tests/data/test414
index 2211d0f40a6ffba84f12026ed1b85034506d1878..391ed0d06e18600320fe781c957b3e9828681064 100644 (file)
--- a/tests/data/test414
+++ b/tests/data/test414
@@ -55,7 +55,7 @@ https
 HTTPS sec-cookie, HTTP redirect, same name cookie, redirect back
 </name>
 <command>
-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
 </command>
 </client>
 

diff --git a/tests/data/test420 b/tests/data/test420
index b7fe4edda1d727fc9eeefad5cf9735da4ad01d57..b5c7cb96b9e4387fd9a1aa325d6b6322468c4cbe 100644 (file)
--- a/tests/data/test420
+++ b/tests/data/test420
@@ -37,9 +37,9 @@ http
 Setting cookies set with expried dates that were loaded from jar
  </name>
  <command>
-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
 </command>
-<file name="log/cookie%TESTNUMBER" mode="text">
+<file name="%LOGDIR/cookie%TESTNUMBER" mode="text">
 %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
 
 </protocol>
-<file name="log/save%TESTNUMBER" mode="text">
+<file name="%LOGDIR/save%TESTNUMBER" mode="text">
 # 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 e3aae0bef948dcc48d9079a102c52b23a6637c73..3826f1556f3ad58d08abd7256869db5f65373dc6 100644 (file)
--- a/tests/data/test430
+++ b/tests/data/test430
@@ -37,19 +37,19 @@ Content-Type: text/3
 #
 # Client-side
 <client>
-<file1 name="log/config%TESTNUMBER-a">
+<file1 name="%LOGDIR/config%TESTNUMBER-a">
 --next
 url = %HOSTIP:%HTTPPORT/%TESTNUMBER0001
 header = "a: a"
 data = "a"
 </file1>
-<file2 name="log/config%TESTNUMBER-b">
+<file2 name="%LOGDIR/config%TESTNUMBER-b">
 --next
 url = %HOSTIP:%HTTPPORT/%TESTNUMBER0002
 header = "b: b"
 data = "b"
 </file2>
-<file3 name="log/config%TESTNUMBER-c">
+<file3 name="%LOGDIR/config%TESTNUMBER-c">
 --next
 url = %HOSTIP:%HTTPPORT/%TESTNUMBER0003
 header = "c: c"
@@ -63,7 +63,7 @@ http
 Three -K uses with --next and --data in each
  </name>
  <command>
--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
 </command>
 </client>
 

diff --git a/tests/data/test431 b/tests/data/test431
index bebe62017e274183c285bd1b77aa96444b469cef..52c39d1bad576703f65bd1367c83c9d98af79826 100644 (file)
--- a/tests/data/test431
+++ b/tests/data/test431
@@ -37,13 +37,13 @@ Content-Type: text/3
 #
 # Client-side
 <client>
-<file1 name="log/config%TESTNUMBER-a">
+<file1 name="%LOGDIR/config%TESTNUMBER-a">
 --next
 url = %HOSTIP:%HTTPPORT/%TESTNUMBER0001
 header = "a: a"
 data = "a"
 </file1>
-<file2 name="log/config%TESTNUMBER-b">
+<file2 name="%LOGDIR/config%TESTNUMBER-b">
 --next
 url = %HOSTIP:%HTTPPORT/%TESTNUMBER0002
 header = "b: b"
@@ -57,7 +57,7 @@ http
 Two -K uses with --next and then one on cmdline
  </name>
  <command>
--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"
 </command>
 </client>
 

diff --git a/tests/data/test432 b/tests/data/test432
index e7fe45b3741f0a4e52dee4ca14f4ffe35edc090c..fd056c36808479277a0fb28c0670ff4744ae17db 100644 (file)
--- a/tests/data/test432
+++ b/tests/data/test432
@@ -37,7 +37,7 @@ Content-Type: text/3
 #
 # Client-side
 <client>
-<file1 name="log/config%TESTNUMBER">
+<file1 name="%LOGDIR/config%TESTNUMBER">
 --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"
 </file1>
-<file2 name="log/config%TESTNUMBER-c">
+<file2 name="%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
  </name>
  <command>
--K log/config%TESTNUMBER
+-K %LOGDIR/config%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test433 b/tests/data/test433
index 34ea4a79c43b3e47f444bd9af671e51a410db916..e86f3deaeb5b68332d0010231ad53aa9dd09c0a8 100644 (file)
--- a/tests/data/test433
+++ b/tests/data/test433
@@ -20,7 +20,7 @@ Content-Type: text/1
 #
 # Client-side
 <client>
-<file1 name="log/.curlrc">
+<file1 name="%LOGDIR/.curlrc">
 --next
 header = "a: a"
 data = "curlrc read"
@@ -29,7 +29,7 @@ data = "curlrc read"
 http
 </server>
 <setenv>
-XDG_CONFIG_HOME=%PWD/log
+XDG_CONFIG_HOME=%PWD/%LOGDIR
 HOME=
 CURL_HOME=
 </setenv>

diff --git a/tests/data/test434 b/tests/data/test434
index d411b161b2b9a1dc6ccfb3fd9d51aa7d3f3f55a8..63d8ce7c6e2883b049321998bf71bd01d4cf863a 100644 (file)
--- a/tests/data/test434
+++ b/tests/data/test434
@@ -19,7 +19,7 @@ Content-Type: text/1
 
 #
 <client>
-<file name="log/config%TESTNUMBER" nonewline="yes">
+<file name="%LOGDIR/config%TESTNUMBER" nonewline="yes">
 url = %HOSTIP:%HTTPPORT/%TESTNUMBER
 </file>
 <server>
@@ -29,7 +29,7 @@ http
 -K with a single line without newline
 </name>
 <command>
--K log/config%TESTNUMBER
+-K %LOGDIR/config%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test436 b/tests/data/test436
index 0a62cfb97ff3f72083c321abbbc9623f6d264d22..d435b5110d38a6471eb4e96ef05b99e91365d7ce 100644 (file)
--- a/tests/data/test436
+++ b/tests/data/test436
@@ -20,7 +20,7 @@ Content-Type: text/1
 #
 # Client-side
 <client>
-<file1 name="log/.config/curlrc">
+<file1 name="%LOGDIR/.config/curlrc">
 --next
 header = "a: a"
 data = "curlrc read"
@@ -29,7 +29,7 @@ data = "curlrc read"
 http
 </server>
 <setenv>
-CURL_HOME=%PWD/log
+CURL_HOME=%PWD/%LOGDIR
 XDG_CONFIG_HOME=
 </setenv>
 <name>

diff --git a/tests/data/test44 b/tests/data/test44
index 4f39bc1eb7d5dd0fac153aaa0049f63b3f2c0a39..880c7aef788d3ef8e0d69a20cbc8f71faf65564c 100644 (file)
--- a/tests/data/test44
+++ b/tests/data/test44
@@ -30,10 +30,10 @@ http
 HTTP RFC1867-type formposting without Expect: header
  </name>
  <command>
-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:"
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar

diff --git a/tests/data/test440 b/tests/data/test440
index 0986cda1a58163bb47daeddd1c8cb160ea40d4a0..a77ef606d9dc80e8e29b1dc94dc3c21c5f2ee181 100644 (file)
--- a/tests/data/test440
+++ b/tests/data/test440
@@ -34,7 +34,7 @@ https
 </features>
 
 # no trailing dot in the file only in the URL
-<file name="log/input%TESTNUMBER">
+<file name="%LOGDIR/input%TESTNUMBER">
 this.hsts.example "99991001 04:47:41"
 </file>
 
@@ -42,7 +42,7 @@ this.hsts.example "99991001 04:47:41"
 HSTS with trailing-dot host name in URL but none in hsts file
 </name>
 <command>
--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'
 </command>
 </client>
 

diff --git a/tests/data/test441 b/tests/data/test441
index 6fbf7be3bd0fbd2975e67c3361f31e194745312f..29b990b891b6b5451f71e2dff29653bf77d0871d 100644 (file)
--- a/tests/data/test441
+++ b/tests/data/test441
@@ -34,7 +34,7 @@ https
 </features>
 
 # no trailing dot in the file only in the URL
-<file name="log/input%TESTNUMBER">
+<file name="%LOGDIR/input%TESTNUMBER">
 this.hsts.example. "99991001 04:47:41"
 </file>
 
@@ -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
 </name>
 <command>
--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'
 </command>
 </client>
 

diff --git a/tests/data/test442 b/tests/data/test442
index cd750eddef5fc488d54c6a9c4a0258f71c755872..2787c02b6f14ad4c06d4cca03fbadc8659ac27a2 100644 (file)
--- a/tests/data/test442
+++ b/tests/data/test442
@@ -38,9 +38,9 @@ http
 Send capped huge number of matching cookies
 </name>
 <command>
-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
 </command>
-<file name="log/cookie%TESTNUMBER" mode="text">
+<file name="%LOGDIR/cookie%TESTNUMBER" mode="text">
 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 ea413b90c9d4553db2421b77ff222d0b7de82022..975d8fdaee71e84c020aff19ecb81719d5847919 100644 (file)
--- a/tests/data/test443
+++ b/tests/data/test443
@@ -38,9 +38,9 @@ http
 Cookie header in request no longer than 8K
 </name>
 <command>
-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
 </command>
-<file name="log/cookie%TESTNUMBER" mode="text">
+<file name="%LOGDIR/cookie%TESTNUMBER" mode="text">
 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 e1f87fe38d1fc1c8e573925ac8dd123c55ccb6cf..8df990280a6c079f4497a07a37afa9b914ede784 100644 (file)
--- a/tests/data/test444
+++ b/tests/data/test444
@@ -116,7 +116,7 @@ http
 Many Set-Cookie response headers
 </name>
 <command>
-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
 </command>
 <features>
 cookies
@@ -133,7 +133,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/cookie%TESTNUMBER" mode="text">
+<file name="%LOGDIR/cookie%TESTNUMBER" mode="text">
 # 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 0e2dfdcfe33b6940f0d7ea7975a8a45a37513b4b..b8e719dd771249ad7a7eb76db06126933c57eab5 100644 (file)
--- a/tests/data/test446
+++ b/tests/data/test446
@@ -52,7 +52,7 @@ CURL_TIME=2000000000
 HSTS with two URLs
 </name>
 <command>
--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
 </command>
 </client>
 
@@ -73,7 +73,7 @@ Proxy-Connection: Keep-Alive
 
 </proxy>
 
-<file name="log/hsts%TESTNUMBER" mode="text">
+<file name="%LOGDIR/hsts%TESTNUMBER" mode="text">
 # 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 9e30c5278fb38a90161f6c0849158fc386fa5bdf..d36787d5445014e55a2221b5a992202b60396073 100644 (file)
--- 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
 </setenv>
  <command>
-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
 </command>
-<file name="log/injar%TESTNUMBER">
+<file name="%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\r
 \r
 </protocol>
-<file name="log/jar%TESTNUMBER" mode="text">
+<file name="%LOGDIR/jar%TESTNUMBER" mode="text">
 # 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 3fcd0f3d50379e83ddfb0c2f6985d1164324c8c8..e94ea0d2a16d3276c86636d6c3564cb389d3e2f8 100644 (file)
--- a/tests/data/test490
+++ b/tests/data/test490
@@ -35,9 +35,9 @@ http
 Two globbed HTTP PUTs
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{log/in%TESTNUMBER,log/in%TESTNUMBER}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{%LOGDIR/in%TESTNUMBER,%LOGDIR/in%TESTNUMBER}'
 </command>
-<file name="log/in%TESTNUMBER">
+<file name="%LOGDIR/in%TESTNUMBER">
 surprise!
 </file>
 </client>

diff --git a/tests/data/test491 b/tests/data/test491
index a2191ffe587198ec17ab70c83107942344d8f2ad..a3c93aa50c947799d5a36c257864ae98c35b43d8 100644 (file)
--- a/tests/data/test491
+++ b/tests/data/test491
@@ -35,9 +35,9 @@ http
 Two globbed HTTP PUTs, the second upload file is missing
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{log/in%TESTNUMBER,log/bad%TESTNUMBER}'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T '{%LOGDIR/in%TESTNUMBER,%LOGDIR/bad%TESTNUMBER}'
 </command>
-<file name="log/in%TESTNUMBER">
+<file name="%LOGDIR/in%TESTNUMBER">
 surprise!
 </file>
 </client>

diff --git a/tests/data/test492 b/tests/data/test492
index 6c704000db5889ba94d85c2db6e864d8b72daf43..dcf18eb694b3c37477214d1092862c075eeb7d3d 100644 (file)
--- a/tests/data/test492
+++ b/tests/data/test492
@@ -35,12 +35,12 @@ http
 Two globbed HTTP PUTs to two globbed URLs
  </name>
  <command>
-'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"
 </command>
-<file name="log/first%TESTNUMBER">
+<file name="%LOGDIR/first%TESTNUMBER">
 first %TESTNUMBER contents
 </file>
-<file1 name="log/second%TESTNUMBER">
+<file1 name="%LOGDIR/second%TESTNUMBER">
 second %TESTNUMBER contents
 </file1>
 </client>

diff --git a/tests/data/test493 b/tests/data/test493
index f0c41105bdf6e407a207614bdfd648464a5ccd6b..1a677d32958c373dcf2ca743c1e6865947c2b522 100644 (file)
--- a/tests/data/test493
+++ b/tests/data/test493
@@ -33,7 +33,7 @@ proxy
 https
 </features>
 
-<file name="log/input%TESTNUMBER">
+<file name="%LOGDIR/input%TESTNUMBER">
 .hsts.example "99991001 04:47:41"
 </file>
 
@@ -41,7 +41,7 @@ https
 HSTS and %{url_effective} after upgrade
 </name>
 <command>
--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'
 </command>
 </client>
 

diff --git a/tests/data/test494 b/tests/data/test494
index 441744619a8bbe024566b3a8dad76319ac0b1d79..78faab6a1d50d7ef356cbd543bd2106777f2a165 100644 (file)
--- a/tests/data/test494
+++ b/tests/data/test494
@@ -25,9 +25,9 @@ ftp
 skip 'macdef' when parsing netrc
  </name>
  <command>
---netrc --netrc-file log/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
+--netrc --netrc-file %LOGDIR/netrc%TESTNUMBER ftp://%HOSTIP:%FTPPORT/%TESTNUMBER
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 
 macdef testmacro
        bin

diff --git a/tests/data/test500 b/tests/data/test500
index 514d0b97451a21aefb38e6bc2702a21fd77f7bc8..384de1b5debc86dabbd028b6921752f7d9977815 100644 (file)
--- a/tests/data/test500
+++ b/tests/data/test500
@@ -38,14 +38,14 @@ lib500
 simple libcurl HTTP GET tool
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip%TESTNUMBER">
+<file name="%LOGDIR/ip%TESTNUMBER">
 IP %HOSTIP
 </file>
 <protocol>

diff --git a/tests/data/test502 b/tests/data/test502
index 11212572d6cd51ee1e1d321c881cf262ada2a289..4a6d60f132d80bbb09201494445d728a77959009 100644 (file)
--- a/tests/data/test502
+++ b/tests/data/test502
@@ -30,9 +30,9 @@ lib%TESTNUMBER
 simple multi file:// get
  </name>
  <command>
-file://%PWD/log/test%TESTNUMBER.txt
+file://%PWD/%LOGDIR/test%TESTNUMBER.txt
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar swsclose
 bar

diff --git a/tests/data/test503 b/tests/data/test503
index 1ad7a552d18e805df60a061e50de382f76cf8c79..11a58f4be6c877abe88d9de4c3add3d1ca961e1c 100644 (file)
--- a/tests/data/test503
+++ b/tests/data/test503
@@ -59,7 +59,7 @@ simple multi http:// through proxytunnel with authentication info
  <command>
 http://machine.%TESTNUMBER:%HTTPPORT/%TESTNUMBER %HOSTIP:%PROXYPORT
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo
    bar
 bar

diff --git a/tests/data/test505 b/tests/data/test505
index 13ddc62d738cfae448f12d1431cbdeed17a0917a..03437063f97ae9bee6fde1ed2270e7362578eb42 100644 (file)
--- a/tests/data/test505
+++ b/tests/data/test505
@@ -23,9 +23,9 @@ lib%TESTNUMBER
 FTP upload with rename after transfer
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/upload%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Contents
 of
 a file

diff --git a/tests/data/test506 b/tests/data/test506
index 44f3afd224a44b76efb5f2d5ded2c8bd56097dae..d6196ec02573c86b92c7d821fd7b93d3f9c32932 100644 (file)
--- 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
 </stdout>
-<file name="log/jar%TESTNUMBER" mode="text">
+<file name="%LOGDIR/jar%TESTNUMBER" mode="text">
 # 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 ce37399fcef478600bc8d69d4556b27555136782..43e5728e97137553ed0d1060bf3109c88365ea21 100644 (file)
--- a/tests/data/test525
+++ b/tests/data/test525
@@ -26,9 +26,9 @@ lib%TESTNUMBER
 FTP PORT upload using multi interface
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>

diff --git a/tests/data/test529 b/tests/data/test529
index 141166c028a157a5e7b8530b66df5e51004ef71d..9c2bc501b55019902e792bb43088aec64834ed25 100644 (file)
--- a/tests/data/test529
+++ b/tests/data/test529
@@ -26,9 +26,9 @@ lib%TESTNUMBER
 FTP PORT upload using multi interface (weird cleanup function sequence)
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>

diff --git a/tests/data/test53 b/tests/data/test53
index 4034a4c6621625fd02af0b37639cf1f3882f90f8..d5997f5a8ea443235011d31cf65e9768ae5c4aee 100644 (file)
--- a/tests/data/test53
+++ b/tests/data/test53
@@ -29,9 +29,9 @@ http
 HTTP, junk session cookies
  </name>
  <command>
-%HOSTIP:%HTTPPORT/want/%TESTNUMBER -b log/injar%TESTNUMBER -j
+%HOSTIP:%HTTPPORT/want/%TESTNUMBER -b %LOGDIR/injar%TESTNUMBER -j
 </command>
-<file name="log/injar%TESTNUMBER">
+<file name="%LOGDIR/injar%TESTNUMBER">
 %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 17ccf68e2298012d4d34b7edb69281f253239bf2..3463613ac86af96695646ed2fac85aa6593032de 100644 (file)
--- a/tests/data/test531
+++ b/tests/data/test531
@@ -29,9 +29,9 @@ lib525
 FTP PORT upload using multi interface and get 425 response
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo
 don't upload this
 </file>

diff --git a/tests/data/test541 b/tests/data/test541
index 2dc75f8a47ac4c9473ced0b67030c03edeba0bd7..fbcfeb4d5edcc3f3d505ca7184790c32e12bacf4 100644 (file)
--- a/tests/data/test541
+++ b/tests/data/test541
@@ -23,9 +23,9 @@ lib%TESTNUMBER
 FTP upload and upload same file again without rewind
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/upload%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Contents
 of
 a file

diff --git a/tests/data/test558 b/tests/data/test558
index 6df79887a5028aef144a53a2ce1eaf4e20e73efe..06b772816ef55c5099e538a5f33eb44190499b80 100644 (file)
--- a/tests/data/test558
+++ b/tests/data/test558
@@ -35,7 +35,7 @@ nothing
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/memdump">
+<file name="%LOGDIR/memdump">
 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 09144f5d9851e022ef610f34df801efa1120a594..1fc3968ebb68568881391bdad5a9209d8f79f024 100644 (file)
--- 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
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip%TESTNUMBER">
+<file name="%LOGDIR/ip%TESTNUMBER">
 CL 0
 </file>
 <protocol>

diff --git a/tests/data/test568 b/tests/data/test568
index 7dd23ca48a0013a9196af94da5fdb5b7855e7cce..7f7df731c1a3467fae42fb1c900dd04bc40c4a8b 100644 (file)
--- a/tests/data/test568
+++ b/tests/data/test568
@@ -61,7 +61,7 @@ RTSP Announce (PUT and POST style) test
 rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 # file written before test command runs
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 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 043c2445d39dd1ad9838cf1d3f2ebcdefab7d3a9..b70e9083cadebff4c506fb00dce4afbcdf60fb7d 100644 (file)
--- a/tests/data/test569
+++ b/tests/data/test569
@@ -66,7 +66,7 @@ lib%TESTNUMBER
 RTSP Session ID parsing
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER log/idfile%TESTNUMBER.txt
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER %LOGDIR/idfile%TESTNUMBER.txt
 </command>
 </client>
 
@@ -100,7 +100,7 @@ CSeq: 6
 Session: A\r
 \r
 </protocol>
-<file name="log/idfile%TESTNUMBER.txt">
+<file name="%LOGDIR/idfile%TESTNUMBER.txt">
 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 f379d7488ecc4d08fcb6577d87884661c7a33022..70b219d91735faf8fbad5c5a529b33bfe37f57e1 100644 (file)
--- a/tests/data/test57
+++ b/tests/data/test57
@@ -26,7 +26,7 @@ http
 HTTP content-type with spaces in
  </name>
  <command>
--w "%{content_type}\n" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o log/out%TESTNUMBER
+-w "%{content_type}\n" http://%HOSTIP:%HTTPPORT/%TESTNUMBER -o %LOGDIR/out%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test571 b/tests/data/test571
index e575343a6eb631320565b28bdeb893359c020098..bae97d418080f9d2dd75a3dec9599128eb060a26 100644 (file)
--- a/tests/data/test571
+++ b/tests/data/test571
@@ -86,7 +86,7 @@ lib%TESTNUMBER
 RTSP RTP Interleaving Test
 </name>
 <command>
-rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER log/protofile%TESTNUMBER.txt
+rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER %LOGDIR/protofile%TESTNUMBER.txt
 </command>
 </client>
 
@@ -114,7 +114,7 @@ RTP PAYLOAD END CORRUPTED (11), [$]
 RTP: message size 63, channel 0
 </stdout>
 
-<file name="log/protofile%TESTNUMBER.txt">
+<file name="%LOGDIR/protofile%TESTNUMBER.txt">
 $99
 </file>
 </verify>

diff --git a/tests/data/test572 b/tests/data/test572
index 0a470559bbeeadbf157c39f547b9d2caf5c94160..ff49988891832527773215ac08ffe63be34dada7 100644 (file)
--- a/tests/data/test572
+++ b/tests/data/test572
@@ -76,7 +76,7 @@ RTSP GET_PARAMETER (Put/Heartbeat/Post)
 rtsp://%HOSTIP:%RTSPPORT/%TESTNUMBER
 </command>
 # file written before test command runs
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 scale
 speed
 </file>

diff --git a/tests/data/test578 b/tests/data/test578
index 2ff8a1f1b0f5f5ace4e990f2b29b18f6c749792c..9bce5818e51d2e25427efc9c6517b7aa91938ae6 100644 (file)
--- 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
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip%TESTNUMBER">
+<file name="%LOGDIR/ip%TESTNUMBER">
 PASSED, UL data matched data size
 </file>
 </verify>

diff --git a/tests/data/test579 b/tests/data/test579
index e4b072bc2399342650066b1a326130ed7fa49142..3a532d811bc9f0d8711db05a50f77eedb94a94d2 100644 (file)
--- a/tests/data/test579
+++ b/tests/data/test579
@@ -68,14 +68,14 @@ lib%TESTNUMBER
 small chunked HTTP POSTs with digest auth. and progress callback
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip%TESTNUMBER">
+<file name="%LOGDIR/ip%TESTNUMBER">
 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 9322ecca7bf000d01b8f6dd74f55ebe0e23c0356..e68cca92628bc11388761b5de62193176703e94e 100644 (file)
--- a/tests/data/test58
+++ b/tests/data/test58
@@ -26,9 +26,9 @@ http
 HTTP PUT from file with weird letters
 </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/ -T log/%TESTNUMBERte[]st.txt -g
+http://%HOSTIP:%HTTPPORT/we/want/ -T %LOGDIR/%TESTNUMBERte[]st.txt -g
 </command>
-<file name="log/%TESTNUMBERte[]st.txt">
+<file name="%LOGDIR/%TESTNUMBERte[]st.txt">
 a few bytes
 </file>
 </client>

diff --git a/tests/data/test582 b/tests/data/test582
index ddf17e3e39c8da71b109cb5858d9eb648c629621..86613e5fbfc5938b1c81b642f229b585b2815dc2 100644 (file)
--- a/tests/data/test582
+++ b/tests/data/test582
@@ -24,9 +24,9 @@ lib%TESTNUMBER
 SFTP upload using multi interface
  </name>
  <command>
-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:
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Moooooooooooo
  upload this
 </file>
@@ -41,7 +41,7 @@ disable
 </strip>
 <protocol>
 </protocol>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Moooooooooooo
  upload this
 </file>

diff --git a/tests/data/test583 b/tests/data/test583
index 029cdac327f57c1d84ffad1b1d465721f25decde..4f6a91bc6e54ba2487221506bea327a81987dc40 100644 (file)
--- 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.
  <command>
-sftp://localhost:%SSHPORT%SSH_PWD/log/upload%TESTNUMBER.txt %USER:
+sftp://localhost:%SSHPORT%SSH_PWD/%LOGDIR/upload%TESTNUMBER.txt %USER:
 </command>
 </client>
 

diff --git a/tests/data/test588 b/tests/data/test588
index 1eb262f5c621e2a2b1aff533f86e137bf4674c24..d36bafee5255b95e8428b5cff062deb9f7c98bf0 100644 (file)
--- a/tests/data/test588
+++ b/tests/data/test588
@@ -35,9 +35,9 @@ lib525
 FTP PORT upload using multi interface, EPRT doesn't work
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER log/upload%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %LOGDIR/upload%TESTNUMBER
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo
  upload this
 </file>

diff --git a/tests/data/test591 b/tests/data/test591
index 843ddb3973a455db932e5270bf5c4accd4123f47..528660145e76cfa171053642a297d479ba0b8d71 100644 (file)
--- a/tests/data/test591
+++ b/tests/data/test591
@@ -37,9 +37,9 @@ lib%TESTNUMBER
 FTP multi PORT and 425 on upload
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo for %TESTNUMBER
  upload this
 </file>

diff --git a/tests/data/test592 b/tests/data/test592
index fc9f15d1deb68c733f34d2c41bbc62d40b943a07..e3a9147be7282e2c6c188f13f4d4038b07cce664 100644 (file)
--- a/tests/data/test592
+++ b/tests/data/test592
@@ -37,9 +37,9 @@ lib591
 FTP multi PORT and 421 on upload
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo for %TESTNUMBER
  upload this
 </file>

diff --git a/tests/data/test593 b/tests/data/test593
index 47c1d94346204d574f09f7836aa43cef4d34bf4e..53a884a0fd2ef9c084aef64d93ef1634113c2acf 100644 (file)
--- 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
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo for %TESTNUMBER
  upload this
 </file>

diff --git a/tests/data/test594 b/tests/data/test594
index 8f5ba95b6a8dbe386a1469dd83f70b5ab8a49e68..dab35062b0b0ad7c26b68bcc4335fd1b7dc5f305 100644 (file)
--- 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
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 log/upload%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/path/%TESTNUMBER %FTPTIME2 %LOGDIR/upload%TESTNUMBER
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Moooooooooooo for %TESTNUMBER
  upload this
 </file>

diff --git a/tests/data/test595 b/tests/data/test595
index 4d2f62b6de21450c4e1b390cfd1bcc485c05231d..f979746d704fd27aa01028326adb0a38ba14be8b 100644 (file)
--- a/tests/data/test595
+++ b/tests/data/test595
@@ -36,7 +36,7 @@ lib585
 verify close callbacks with passive FTP
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/ip%TESTNUMBER
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test596 b/tests/data/test596
index 64bd52b57713d6111cd23383843f26f0bc4ebc2c..27d5d849ecfda20ab5930d5aa607b2c5d718e0de 100644 (file)
--- a/tests/data/test596
+++ b/tests/data/test596
@@ -36,7 +36,7 @@ lib585
 verify close callbacks with active FTP
  </name>
  <command>
-ftp://%HOSTIP:%FTPPORT/%TESTNUMBER log/ip%TESTNUMBER activeftp
+ftp://%HOSTIP:%FTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER activeftp
 </command>
 </client>
 

diff --git a/tests/data/test599 b/tests/data/test599
index 5911b96efc632dd0734357832418d71d70fcedcf..9ca266a3ea28adb09c5421ce6cbe8876f706e62a 100644 (file)
--- a/tests/data/test599
+++ b/tests/data/test599
@@ -72,14 +72,14 @@ lib%TESTNUMBER
 HTTP GET with progress callback and redirects changing content sizes
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/ip%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/ip%TESTNUMBER
 </command>
 </client>
 
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/ip%TESTNUMBER">
+<file name="%LOGDIR/ip%TESTNUMBER">
 CL -1
 </file>
 </verify>

diff --git a/tests/data/test600 b/tests/data/test600
index 88a6055c39057a220a07407e1e623011d677c934..9ff12faf023b49d78c75a242a3b2ed45f2c3371c 100644 (file)
--- a/tests/data/test600
+++ b/tests/data/test600
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test601 b/tests/data/test601
index cadeeafe0d3d695b3d61632ed6466f3230b4cb8b..6f995f19ed0b6fb12237b42e730ce210d8ee8d26 100644 (file)
--- a/tests/data/test601
+++ b/tests/data/test601
@@ -24,9 +24,9 @@ scp
 SCP retrieval
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test602 b/tests/data/test602
index 56d2747f225590cc3f156b0d1b1263dc65e0e43e..bf6bc3f7ad0020ee4c1a3b15d363a6f47600f5ea 100644 (file)
--- a/tests/data/test602
+++ b/tests/data/test602
@@ -21,9 +21,9 @@ sftp
 SFTP put
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>

diff --git a/tests/data/test603 b/tests/data/test603
index b873f1587ef43ba09e11e863cdcd83f00bef88c3..530ed9ca6904e4129146526a4af9dd12caccb438 100644 (file)
--- a/tests/data/test603
+++ b/tests/data/test603
@@ -21,9 +21,9 @@ scp
 SCP upload
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>

diff --git a/tests/data/test608 b/tests/data/test608
index f919e9c7376db34ff2107fd786994474ff69e516..f909506186ef7af824406fbe47d481017e75fb2b 100644 (file)
--- a/tests/data/test608
+++ b/tests/data/test608
@@ -24,14 +24,14 @@ sftp
 SFTP post-quote rename
  </name>
  <command>
---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
 </command>
 # 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.
 <postcheck>
-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
 </postcheck>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test file for rename test
 </file>
 </client>
@@ -39,7 +39,7 @@ Test file for rename test
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test file for rename test
 </file>
 <valgrind>

diff --git a/tests/data/test609 b/tests/data/test609
index 66057d255650dc84779d6012a38a4784b3af3a97..bf1eff08fe574251d556c627ce4441c907433e05 100644 (file)
--- a/tests/data/test609
+++ b/tests/data/test609
@@ -25,9 +25,9 @@ sftp
 SFTP post-quote mkdir failure
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test file for mkdir test
 </file>
 </client>

diff --git a/tests/data/test61 b/tests/data/test61
index 98c56498f21d4c0f7373c256f21672f10c90cc16..b1f53b1e30b7fd8288591a66fdaed9ea2aee296a 100644 (file)
--- a/tests/data/test61
+++ b/tests/data/test61
@@ -45,7 +45,7 @@ HTTP with various cookies and custom Host:
 TZ=GMT
 </setenv>
  <command>
-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"
 </command>
 <features>
 cookies
@@ -61,7 +61,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/jar%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
 # 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 d9eb2e6be49b447dd1d258b1d3768febd2542948..a6d8a2354b88d58160c15354e8f79d18fe8f6295 100644 (file)
--- a/tests/data/test610
+++ b/tests/data/test610
@@ -21,18 +21,18 @@ Dummy test file for rmdir test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test%TESTNUMBER.pl mkdir %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test%TESTNUMBER.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rmdir
  </name>
  <command>
---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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test%TESTNUMBER.pl gone %PWD/%LOGDIR/test%TESTNUMBER.dir
 </postcheck>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for rmdir test
 </file>
 </client>

diff --git a/tests/data/test611 b/tests/data/test611
index ee2a185b13f8d98dba12c6533cb5d8d029c9acb1..14fa4f18b7623c6c479e891f6a6e1c711b31bf3a 100644 (file)
--- a/tests/data/test611
+++ b/tests/data/test611
@@ -21,18 +21,18 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rename
  </name>
  <command>
---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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.new
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
 </postcheck>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
 </client>

diff --git a/tests/data/test612 b/tests/data/test612
index 1d6fadec8c06052647b991bedf9e27a0a82fa6e0..04890c6c7ef4375f5b9eeb6a5a9ed4bdbe7f9c73 100644 (file)
--- a/tests/data/test612
+++ b/tests/data/test612
@@ -24,12 +24,12 @@ sftp
 SFTP post-quote remove file
  </name>
  <command>
---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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/log/test%TESTNUMBER.txt
+perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
 </postcheck>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for remove test
 </file>
 </client>

diff --git a/tests/data/test613 b/tests/data/test613
index d02e3bbecd58bba0429200b453b8f84b7e977733..9bf30ad0d5e6d1d49a01ef3c93075952097cdfdf 100644 (file)
--- a/tests/data/test613
+++ b/tests/data/test613
@@ -23,16 +23,16 @@ d?????????    N U         U               N ???  N NN:NN asubdir
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test%TESTNUMBER.pl prepare %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test%TESTNUMBER.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP directory retrieval
  </name>
  <command>
---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
 </command>
 <postcheck>
-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
 </postcheck>
 </client>
 

diff --git a/tests/data/test614 b/tests/data/test614
index c0af2630a64cbbbc70287760e0628d89e3f94a76..90e2e48035133da46a685d6acf093412575c77dd 100644 (file)
--- a/tests/data/test614
+++ b/tests/data/test614
@@ -24,16 +24,16 @@ d?????????    N U         U               N ???  N NN:NN asubdir
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP pre-quote chmod
  </name>
  <command>
---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
 </command>
 <postcheck>
-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
 </postcheck>
 </client>
 

diff --git a/tests/data/test615 b/tests/data/test615
index 09a825b035227e7797be320690c6a89642e4b0fd..529bb2c3e67f18f7d07aa9e0f8b283ba1a0e9c82 100644 (file)
--- a/tests/data/test615
+++ b/tests/data/test615
@@ -14,18 +14,18 @@ FAILURE
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test613.pl prepare %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP put remote failure
  </name>
  <command>
---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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test613.pl postprocess %PWD/%LOGDIR/test%TESTNUMBER.dir
 </postcheck>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>

diff --git a/tests/data/test616 b/tests/data/test616
index ec03c31ba994de4eb31265ae36a924f9f93cabaf..0feb69e1a9bae42003f2a0197044081594f573e8 100644 (file)
--- a/tests/data/test616
+++ b/tests/data/test616
@@ -23,9 +23,9 @@ sftp
 SFTP retrieval of empty file
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 </file>
 </client>
 

diff --git a/tests/data/test617 b/tests/data/test617
index 3c067e399011a855f68d8ec6675263c3c6fc1bd4..c72379869bcdd6e3f10c3944e030b89c6268b5b7 100644 (file)
--- a/tests/data/test617
+++ b/tests/data/test617
@@ -23,9 +23,9 @@ scp
 SCP retrieval of empty file
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 </file>
 </client>
 

diff --git a/tests/data/test618 b/tests/data/test618
index f5e2c7b33d6cc06a4de2891c0401317737778039..5c083ac66012432bdee5b941cbb0c86aeabdcb6c 100644 (file)
--- a/tests/data/test618
+++ b/tests/data/test618
@@ -15,9 +15,9 @@ sftp
 SFTP retrieval of two files
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test619 b/tests/data/test619
index 0f86d8a54a5e62f436a3756aaf4815f98e83c8bd..5dcebfd823ed38d88869e1ddc59c9bd1b6310977 100644 (file)
--- a/tests/data/test619
+++ b/tests/data/test619
@@ -15,9 +15,9 @@ scp
 SCP retrieval of two files
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test62 b/tests/data/test62
index 08fbf8e5dd5b0b6104c1b759619c16dfd7f015f0..0484e8c85500f2625da1b279582ee5e996ab6930 100644 (file)
--- a/tests/data/test62
+++ b/tests/data/test62
@@ -29,9 +29,9 @@ http
 HTTP, send cookies when using custom Host:
  </name>
  <command>
-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"
 </command>
-<file name="log/jar%TESTNUMBER.txt">
+<file name="%LOGDIR/jar%TESTNUMBER.txt">
 # 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 fea44acf38e073fb94886cc9f11e0a45f2cf1a63..f33a4f096822c55cd602328ce757f794790c5e9d 100644 (file)
--- a/tests/data/test620
+++ b/tests/data/test620
@@ -16,9 +16,9 @@ sftp
 SFTP retrieval of missing file followed by good file
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test621 b/tests/data/test621
index 368baf6a0d60760df2d7ad3ae0c7e63506507d1b..b564812622efcfeec3fe35e28153d70da3ff2ed3 100644 (file)
--- a/tests/data/test621
+++ b/tests/data/test621
@@ -16,9 +16,9 @@ scp
 SCP retrieval of missing file followed by good file
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test622 b/tests/data/test622
index c4f8508d341d437d8d044d62d80e64eb3e226e8d..02129f57fb28132add7b467bd76553e9fa379ca9 100644 (file)
--- a/tests/data/test622
+++ b/tests/data/test622
@@ -22,9 +22,9 @@ sftp
 SFTP put failure
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>

diff --git a/tests/data/test623 b/tests/data/test623
index d1afb405f9b4b0494e058b3fb976dacb2d22221e..ca2ba17a31498160e6cd0834cac6729b0c6288de 100644 (file)
--- a/tests/data/test623
+++ b/tests/data/test623
@@ -22,9 +22,9 @@ scp
 SCP upload failure
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>

diff --git a/tests/data/test624 b/tests/data/test624
index 8daa93530e47c17ee88c6eaf71735b013e51ff6a..5ef6f853260aae0eeb96a49be8b61c9f3be5bd63 100644 (file)
--- a/tests/data/test624
+++ b/tests/data/test624
@@ -22,12 +22,12 @@ sftp
 SFTP put with --ftp-create-dirs
  </name>
  <command>
---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
 </command>
 <postcheck>
-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
 </postcheck>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>

diff --git a/tests/data/test625 b/tests/data/test625
index e6f0d77f0eb2c0729e96d66b615c92b17de46d29..600a3e64db3bd23b3e3a45bbddba7f51c8ae52ce 100644 (file)
--- a/tests/data/test625
+++ b/tests/data/test625
@@ -22,12 +22,12 @@ sftp
 SFTP put with --ftp-create-dirs twice
  </name>
  <command>
---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
 </command>
 <postcheck>
-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
 </postcheck>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh upload test
 </file>

diff --git a/tests/data/test626 b/tests/data/test626
index 0580f535b5942744870b78fb4d6af2e8d16345b3..1cc1a68776bedef40082ff3512f4385dc3c60bde 100644 (file)
--- a/tests/data/test626
+++ b/tests/data/test626
@@ -22,9 +22,9 @@ sftp
 SFTP invalid quote command
  </name>
  <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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test file for rename test
 </file>
 </client>

diff --git a/tests/data/test627 b/tests/data/test627
index 60b830e9221d9414db98de0e2a5c231695cd370b..af9111a74ea79ddf203df098559ea1a53641999c 100644 (file)
--- a/tests/data/test627
+++ b/tests/data/test627
@@ -24,12 +24,12 @@ sftp
 SFTP quote remove file with NOBODY
  </name>
  <command>
---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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl gone %PWD/log/test%TESTNUMBER.txt
+perl %SRCDIR/libtest/test610.pl gone %PWD/%LOGDIR/test%TESTNUMBER.txt
 </postcheck>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for remove test
 </file>
 </client>

diff --git a/tests/data/test630 b/tests/data/test630
index f678528b0e54fa8e28ad7f4ebf098bc6fb423ce5..f23e28085d0c5d3757a13e376df1527daa95b7fb 100644 (file)
--- a/tests/data/test630
+++ b/tests/data/test630
@@ -17,7 +17,7 @@ sftp
 SFTP incorrect host key
  </name>
  <command>
---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
 </command>
 </client>
 

diff --git a/tests/data/test631 b/tests/data/test631
index 720f3716ff7c2f6ef50dc6138e53cc76d2a8745b..72a361fc895aeb5aa813d7ae0ff11597fa09edfe 100644 (file)
--- a/tests/data/test631
+++ b/tests/data/test631
@@ -17,7 +17,7 @@ scp
 SCP incorrect host key
  </name>
  <command>
---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
 </command>
 </client>
 

diff --git a/tests/data/test632 b/tests/data/test632
index 70cfe515afcfb67fe45802637e10f496430e2431..57f4917fcce19134d7a0bc48fc88172cd0111f50 100644 (file)
--- a/tests/data/test632
+++ b/tests/data/test632
@@ -20,7 +20,7 @@ sftp
 SFTP syntactically invalid host key
  </name>
  <command>
---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
 </command>
 </client>
 

diff --git a/tests/data/test633 b/tests/data/test633
index f9ad869f18913664bab2fa9222b4883a33498587..053fb7f7de56aad86658197d990f7b9acb39344c 100644 (file)
--- a/tests/data/test633
+++ b/tests/data/test633
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval with byte range
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test634 b/tests/data/test634
index 9cf9320fec0ddc78f930821013b2493713b71aee..32f5dafe57fee312f954f18c6f46359d247b0990 100644 (file)
--- a/tests/data/test634
+++ b/tests/data/test634
@@ -25,9 +25,9 @@ sftp
 SFTP retrieval with byte range past end of file
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test635 b/tests/data/test635
index 5974ee8d3d48f823f4a37edd874671ef2faca1a1..a8ad622cf4e87ff9ae289b0985b697cef1ecfad9 100644 (file)
--- a/tests/data/test635
+++ b/tests/data/test635
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval with byte range relative to end of file
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test636 b/tests/data/test636
index 6bce35b90776b642703f1db062cc244902e5db22..0ad308cc18c0616dd01c5f8c5a31039d58e11990 100644 (file)
--- a/tests/data/test636
+++ b/tests/data/test636
@@ -25,9 +25,9 @@ sftp
 SFTP retrieval with X- byte range
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test637 b/tests/data/test637
index 542506749b952d7eeb733d2e41763075fff9a497..98c513b31449b759b450db82eb0a279e9c310ffe 100644 (file)
--- a/tests/data/test637
+++ b/tests/data/test637
@@ -23,9 +23,9 @@ sftp
 SFTP retrieval with invalid X- range
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test638 b/tests/data/test638
index 85d59096fc5fa32746664d2ca8a22156ddf55b45..ecf89497e9dd15a6823ba049e8b4f0b955e25f58 100644 (file)
--- a/tests/data/test638
+++ b/tests/data/test638
@@ -23,18 +23,18 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rename * asterisk accept-fail
  </name>
  <command>
---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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.new
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.new
 </postcheck>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
 </client>

diff --git a/tests/data/test639 b/tests/data/test639
index e63cdf61f900f29c97f0b074edeca4dfcdf3f74f..6df83af7b00dd8d543012c30bb12750a9edfdf72 100644 (file)
--- a/tests/data/test639
+++ b/tests/data/test639
@@ -23,18 +23,18 @@ Dummy test file for rename test
 sftp
 </server>
 <precheck>
-perl %SRCDIR/libtest/test610.pl mkdir %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test610.pl mkdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </precheck>
  <name>
 SFTP post-quote rename * asterisk accept-fail
  </name>
  <command>
---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
 </command>
 <postcheck>
-perl %SRCDIR/libtest/test610.pl rmdir %PWD/log/test%TESTNUMBER.dir
+perl %SRCDIR/libtest/test610.pl rmdir %PWD/%LOGDIR/test%TESTNUMBER.dir
 </postcheck>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Dummy test file for rename test
 </file>
 </client>

diff --git a/tests/data/test640 b/tests/data/test640
index 2046dabd8586b85aae248dac1b636b15c73b19c1..3b6e6b62b71d5b4658fd8c66111ffe7a096c44bb 100644 (file)
--- a/tests/data/test640
+++ b/tests/data/test640
@@ -23,9 +23,9 @@ sftp
 SFTP --head retrieval
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test641 b/tests/data/test641
index df1788a0b73652eb4fa452acc681ba7d0a50ae89..91e8cdb4ea68c7416e55c7731c6ab2e4ab5ee9a0 100644 (file)
--- a/tests/data/test641
+++ b/tests/data/test641
@@ -23,9 +23,9 @@ scp
 SCP --head retrieval
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test642 b/tests/data/test642
index 4fa5282c9260f160a367c67067e804f0aef769cc..dfbbdbadadfbbb5de0fafa66829084703b5d90cf 100644 (file)
--- a/tests/data/test642
+++ b/tests/data/test642
@@ -24,9 +24,9 @@ sftp
 SFTP retrieval
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 Test data
 for ssh test
 </file>

diff --git a/tests/data/test644 b/tests/data/test644
index c067d034c5b5e764509b6debfb5c21fa2325d9a8..fc670756cb371e989399a9c0b617b7dbde50adc0 100644 (file)
--- a/tests/data/test644
+++ b/tests/data/test644
@@ -58,7 +58,7 @@ CURL_FAKE_XATTR=1
 --xattr with redirect
 </name>
 <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -L -o log/out%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --xattr -L -o %LOGDIR/out%TESTNUMBER
 </command>
 </client>
 

diff --git a/tests/data/test646 b/tests/data/test646
index 3418fa24c1440b02633efd21d07b71abc4903320..ef9191e75bd8b83b4358be8ca537380066420d6c 100644 (file)
--- a/tests/data/test646
+++ b/tests/data/test646
@@ -30,14 +30,14 @@ To: another
 body\r
 </stdin>
  <command>
-smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;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=<log/headers%TESTNUMBER" -H "From: different" -H "To: another" -H "Reply-To: <followup@example.com>"
+smtp://%HOSTIP:%SMTPPORT/%TESTNUMBER --mail-rcpt recipient@example.com --mail-from sender@example.com -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;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: <followup@example.com>"
 </command>
-<file1 name="log/test%TESTNUMBER.txt">
+<file1 name="%LOGDIR/test%TESTNUMBER.txt">
 This is an attached file.
 
 It may contain any type of data.
 </file1>
-<file2 name="log/headers%TESTNUMBER">
+<file2 name="%LOGDIR/headers%TESTNUMBER">
 # This line is a comment
 X-fileheader1: This is a header from a file \r
 

diff --git a/tests/data/test647 b/tests/data/test647
index 90d44c2c4bfb7298f7ebc6045541fce495b25354..1b0e15235da2a95b5f33fdf90098d8c868149fa9 100644 (file)
--- a/tests/data/test647
+++ b/tests/data/test647
@@ -25,9 +25,9 @@ imap
 IMAP APPEND multipart using mime API
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;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 <foobar@example.com>" -H "To: joe@example.com" -H "Message-Id: <B27397-0100000@example.com>" -H "Subject: afternoon meeting" -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -F "=(;type=multipart/alternative" -F "= <body>This is the html version</body>;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 <foobar@example.com>" -H "To: joe@example.com" -H "Message-Id: <B27397-0100000@example.com>" -H "Subject: afternoon meeting" -u user:secret
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 This is an attached file.
 
 It may contain any type of data.

diff --git a/tests/data/test648 b/tests/data/test648
index fe32cd5ee9a88a42de5033700019ee8b3aced842..3403e2100457fcad7f4a082c46009f108aa1ce5f 100644 (file)
--- a/tests/data/test648
+++ b/tests/data/test648
@@ -30,9 +30,9 @@ To: another
 body\r
 </stdin>
  <command>
-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"
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 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 668cdc75a0f244f7d9f55bfc094db100a4b0b139..eced79a860d4374cd5c7aaa41e9c224845bdf512 100644 (file)
--- a/tests/data/test649
+++ b/tests/data/test649
@@ -30,9 +30,9 @@ To: another
 body\r
 </stdin>
  <command>
-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"
 </command>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 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 e2626b75238fae966708814c54c7f5c94a69ee59..c1dcd86438f166d9690ca12a254033d6ae412649 100644 (file)
--- a/tests/data/test650
+++ b/tests/data/test650
@@ -41,9 +41,9 @@ HTTP formpost using form API
  Some data from stdin
 </stdin>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/test%TESTNUMBER.filedata
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/test%TESTNUMBER.filedata
 </command>
-<file name="log/test%TESTNUMBER.filedata">
+<file name="%LOGDIR/test%TESTNUMBER.filedata">
 This is data from a file.
 </file>
 </client>

diff --git a/tests/data/test651 b/tests/data/test651
index 38f21c3ad14130334e9fb5110806c7bfa094d923..b58c224cb99a6cfbfe6ed4a98d604f42b96de9c5 100644 (file)
--- a/tests/data/test651
+++ b/tests/data/test651
@@ -41,9 +41,9 @@ curl_formadd with huge COPYCONTENTS
  Some data from stdin
 </stdin>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER log/test%TESTNUMBER.filedata
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER %LOGDIR/test%TESTNUMBER.filedata
 </command>
-<file name="log/test%TESTNUMBER.filedata">
+<file name="%LOGDIR/test%TESTNUMBER.filedata">
 This is data from a file.
 </file>
 </client>

diff --git a/tests/data/test654 b/tests/data/test654
index 5716a0ba6bde22936c9842a14affc939f4a2700f..f046f9e279f8e5b4d04fed0c3b9c0ceb67d49636 100644 (file)
--- a/tests/data/test654
+++ b/tests/data/test654
@@ -56,7 +56,7 @@ HTTP duplicate easy handle with mime data
  <command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 This is data from a file
 </file>
 </client>

diff --git a/tests/data/test664 b/tests/data/test664
index 69a75df3f8c446aea719aa4da97339894dca9917..158d03cfad768743007cde4d23ff6f0e860d0ba1 100644 (file)
--- a/tests/data/test664
+++ b/tests/data/test664
@@ -24,9 +24,9 @@ sftp
 SFTP correct host key
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 test
 </file>
 </client>

diff --git a/tests/data/test665 b/tests/data/test665
index aa20bbfe1949b09e9a7bc7daed56efafd1d372c2..f1fb76c7c9ff91678af279a4da87bb730dd50cca 100644 (file)
--- a/tests/data/test665
+++ b/tests/data/test665
@@ -24,9 +24,9 @@ scp
 SCP correct host key
  </name>
  <command>
---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
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 test
 </file>
 </client>

diff --git a/tests/data/test668 b/tests/data/test668
index c1a0f8f19fffcf90fd2089af00b9718f880520d7..984d2e0d28f27b584136e8c9ad28d4f3039f2fce 100644 (file)
--- a/tests/data/test668
+++ b/tests/data/test668
@@ -49,7 +49,7 @@ HTTP mimepost early end of data detection
  <command>
 http://%HOSTIP:%HTTPPORT/%TESTNUMBER
 </command>
-<file name="log/file%TESTNUMBER.txt">
+<file name="%LOGDIR/file%TESTNUMBER.txt">
 This is data from a file
 </file>
 </client>

diff --git a/tests/data/test676 b/tests/data/test676
index 1197ec515279dd6af1824cbac01939faf6d383cf..4ca312c1b6d30fe2953f1ceacd7cb59500f59c98 100644 (file)
--- a/tests/data/test676
+++ b/tests/data/test676
@@ -44,7 +44,7 @@ Content-Type: text/html
 
 # Client-side
 <client>
-<file name="log/cookies676">
+<file name="%LOGDIR/cookies676">
 %HOSTIP        TRUE    /we/want/       FALSE   2118138987      proven  yes
 </file>
 <server>

diff --git a/tests/data/test679 b/tests/data/test679
index 53b20c6e0b0c2c1c2339033ac3ccb9393c1afd9c..d435ae0dbbe52ba7fdbc3ff2915ac175c4596d54 100644 (file)
--- a/tests/data/test679
+++ b/tests/data/test679
@@ -34,9 +34,9 @@ http
 netrc with quoted password
  </name>
  <command>
---netrc-optional --netrc-file log/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/
+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 machine %HOSTIP login user1 password "with spaces and \"\n\r\t\a"
 </file>
 </client>

diff --git a/tests/data/test680 b/tests/data/test680
index 23e194daaee76599790bc7a0d9b6e596091b9277..2cd0d47fe03ec2eacbec586b9a3f9e7785ecf7be 100644 (file)
--- a/tests/data/test680
+++ b/tests/data/test680
@@ -23,9 +23,9 @@ http
 netrc with quoted password but missing end quote
  </name>
  <command>
---netrc --netrc-file log/netrc%TESTNUMBER http://user1@http.example/
+--netrc --netrc-file %LOGDIR/netrc%TESTNUMBER http://user1@http.example/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 machine %HOSTIP login user1 password "with spaces and \"\n\r\t\a
 </file>
 </client>

diff --git a/tests/data/test682 b/tests/data/test682
index dfe076e5e7c42735d12ed61ddf78266ac5c36b72..0e3a789e652a6d6788c603b92788483e173ed535 100644 (file)
--- a/tests/data/test682
+++ b/tests/data/test682
@@ -30,9 +30,9 @@ http
 netrc with multiple logins - pick first
  </name>
  <command>
---netrc-optional --netrc-file log/netrc%TESTNUMBER http://user1@%HOSTIP:%HTTPPORT/
+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user1@%HOSTIP:%HTTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>

diff --git a/tests/data/test683 b/tests/data/test683
index cf6ea44733bd211c1801ca13cbf221967608c260..4cbf5f077d38280dfe388852e21a7cd684cc8045 100644 (file)
--- a/tests/data/test683
+++ b/tests/data/test683
@@ -30,9 +30,9 @@ http
 netrc with multiple logins - pick second
  </name>
  <command>
---netrc-optional --netrc-file log/netrc%TESTNUMBER http://user2@%HOSTIP:%HTTPPORT/
+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user2@%HOSTIP:%HTTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 machine %HOSTIP login user1 password passwd1
 machine %HOSTIP login user2 password passwd2
 </file>

diff --git a/tests/data/test684 b/tests/data/test684
index d7391a1319698029ef1181f468fb7002e79c634d..712ee3be0744fb56c55d922e8f578144b6280480 100644 (file)
--- a/tests/data/test684
+++ b/tests/data/test684
@@ -30,9 +30,9 @@ http
 netrc with no login
  </name>
  <command>
---netrc-optional --netrc-file log/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/
+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://%HOSTIP:%HTTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 machine %HOSTIP password 5up3r53cr37
 </file>
 </client>

diff --git a/tests/data/test685 b/tests/data/test685
index ba520bd54291982ceead24d395a16f8a1faf0098..9d64fe788461fa3a950e298ebeb62b385436c3e2 100644 (file)
--- a/tests/data/test685
+++ b/tests/data/test685
@@ -30,9 +30,9 @@ http
 netrc with no login - provided user
  </name>
  <command>
---netrc-optional --netrc-file log/netrc%TESTNUMBER http://user@%HOSTIP:%HTTPPORT/
+--netrc-optional --netrc-file %LOGDIR/netrc%TESTNUMBER http://user@%HOSTIP:%HTTPPORT/
 </command>
-<file name="log/netrc%TESTNUMBER" >
+<file name="%LOGDIR/netrc%TESTNUMBER" >
 machine %HOSTIP password 5up3r53cr37
 </file>
 </client>

diff --git a/tests/data/test7 b/tests/data/test7
index 06df71d3cf89b546033cdb059c77beed9b4a6739..b7487ffb705b95ebdd1cc24a52b745ea287e6ca3 100644 (file)
--- a/tests/data/test7
+++ b/tests/data/test7
@@ -32,7 +32,7 @@ http
 HTTP with cookie parser and header recording
  </name>
  <command>
-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
 </command>
 </client>
 
@@ -45,7 +45,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/heads%TESTNUMBER.txt">
+<file name="%LOGDIR/heads%TESTNUMBER.txt">
 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 56c36e1b611db0777efb67aff312e65e177c0868..a5b6db6e984a39819710cec16e21102c0c7a73c4 100644 (file)
--- a/tests/data/test71
+++ b/tests/data/test71
@@ -33,14 +33,14 @@ HTTP and -F upload in config file
 <stdin>
 -F name=daniel
 -F tool=curl
--F file=@log/test%TESTNUMBER.txt
+-F file=@%LOGDIR/test%TESTNUMBER.txt
 user-agent = ""
 </stdin>
  <command>
 http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -K -
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar

diff --git a/tests/data/test73 b/tests/data/test73
index 4248db525e1353bc79c1cc4842b966255274a36a..c5c2c009a07cbbf60443de0502ce568ecc46f3ff 100644 (file)
--- 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
  </name>
  <command>
-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"
 </command>
 <features>
 cookies
@@ -45,7 +45,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/jar%TESTNUMBER.txt" mode="text">
+<file name="%LOGDIR/jar%TESTNUMBER.txt" mode="text">
 # 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 524a70eb8c3e2b8ce7b008e217fc497a4109d483..a2ecdd98bbea7959e05f671bdac9686b4ace7af6 100644 (file)
--- a/tests/data/test74
+++ b/tests/data/test74
@@ -43,7 +43,7 @@ http
 HTTP, urlglob {}-retrieval and -o #[num] usage
  </name>
  <command option="no-output">
-"http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0001}" -o "log/dumpit#1.dump"
+"http://%HOSTIP:%HTTPPORT/{%TESTNUMBER,%TESTNUMBER0001}" -o "%LOGDIR/dumpit#1.dump"
 </command>
 </client>
 
@@ -62,7 +62,7 @@ User-Agent: curl/%VERSION
 Accept: */*\r
 \r
 </protocol>
-<file name="log/dumpit%TESTNUMBER0001.dump">
+<file name="%LOGDIR/dumpit%TESTNUMBER0001.dump">
 HTTP/1.0 200 OK
 Content-Type: text/html
 Funny-head: swsclose

diff --git a/tests/data/test75 b/tests/data/test75
index 7bee044435b6bab812a8fb991265601b286cd555..b11295c99121294f51a79a26f23f2fea037d9918 100644 (file)
--- a/tests/data/test75
+++ b/tests/data/test75
@@ -25,7 +25,7 @@ http
 HTTP, urlglob retrieval with bad range
  </name>
  <command option="no-output">
-"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 -
 </command>
 </client>
 

diff --git a/tests/data/test8 b/tests/data/test8
index 93f2a9945983d46e667d27e8d58fd9e8bfabd313..7d087f337de4592c941f6be5fa9d5aaa1009357e 100644 (file)
--- a/tests/data/test8
+++ b/tests/data/test8
@@ -25,11 +25,11 @@ http
 HTTP with cookie parsing from header file
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b log/heads%TESTNUMBER.txt
+http://%HOSTIP:%HTTPPORT/we/want/%TESTNUMBER -b %LOGDIR/heads%TESTNUMBER.txt
 </command>
 
 # We create this file before the command is invoked!
-<file name="log/heads%TESTNUMBER.txt">
+<file name="%LOGDIR/heads%TESTNUMBER.txt">
 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 5ce64a791aba6859fed95103bbdfc53afbe8a76a..07fb97cfa5cb612bc4b18a6da3963474173754fa 100644 (file)
--- a/tests/data/test805
+++ b/tests/data/test805
@@ -23,9 +23,9 @@ imap
 IMAP APPEND message
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -u user:secret
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)\r
 From: Fred Foobar <foobar@example.COM>\r
 Subject: afternoon meeting\r

diff --git a/tests/data/test86 b/tests/data/test86
index 5d4399c7156e387f60a371b54da20f6d6b06b25e..62284e942f33fa3b2f6bb7f2dbaa46c706ada3d5 100644 (file)
--- a/tests/data/test86
+++ b/tests/data/test86
@@ -57,7 +57,7 @@ http
 HTTP, urlglob []-retrieval and -o #[num] usage
  </name>
  <command option="no-output">
-"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0003]" -o "log/dumpit#1.dump"
+"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0003]" -o "%LOGDIR/dumpit#1.dump"
 </command>
 </client>
 
@@ -83,7 +83,7 @@ Accept: */*
 </protocol>
 
 # we check the second file
-<file name="log/dumpit%TESTNUMBER0002.dump">
+<file name="%LOGDIR/dumpit%TESTNUMBER0002.dump">
 HTTP/1.0 200 OK
 Content-Type: text/html
 Funny-head: swsclose

diff --git a/tests/data/test87 b/tests/data/test87
index ff702dc47041f7e2059ab33e8574bd504ce04a79..5cf7de5a7308fc8dd4098697aac01a2f994050b6 100644 (file)
--- a/tests/data/test87
+++ b/tests/data/test87
@@ -40,7 +40,7 @@ http
 urlglob with out of range -o #[num] usage
  </name>
  <command option="no-output">
-"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0002]" -o "log/dumpit%TESTNUMBER-#2.dump"
+"http://%HOSTIP:%HTTPPORT/[%TESTNUMBER0001-%TESTNUMBER0002]" -o "%LOGDIR/dumpit%TESTNUMBER-#2.dump"
 </command>
 </client>
 
@@ -50,7 +50,7 @@ urlglob with out of range -o #[num] usage
 # survives
 #
 <verify>
-<file name="log/dumpit%TESTNUMBER-#2.dump">
+<file name="%LOGDIR/dumpit%TESTNUMBER-#2.dump">
 HTTP/1.1 200 OK\r
 Funny-head: yesyes\r
 Content-Length: 16\r

diff --git a/tests/data/test88 b/tests/data/test88
index 842031a8585ae39d942dc1130a8e215f5dc4d93d..1ca5d8877578f84ba3e6d59563283374fa8c3aac 100644 (file)
--- a/tests/data/test88
+++ b/tests/data/test88
@@ -63,9 +63,9 @@ crypto
 HTTP PUT with Digest authorization
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T log/put%TESTNUMBER -u testuser:testpass --digest
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -T %LOGDIR/put%TESTNUMBER -u testuser:testpass --digest
 </command>
-<file name="log/put%TESTNUMBER">
+<file name="%LOGDIR/put%TESTNUMBER">
 This is data we upload with PUT
 a second line
 line three

diff --git a/tests/data/test897 b/tests/data/test897
index 1a537ea60b2bde5ccffd52e9d35aaf782bdbcb3b..5c4410cc33f8e222f0a99e5bf48d0a5efc8a3338 100644 (file)
--- a/tests/data/test897
+++ b/tests/data/test897
@@ -31,7 +31,7 @@ imap
 IMAP and envelope meta data after body transfer
  </name>
  <command>
-'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
 </command>
 </client>
 
@@ -45,7 +45,7 @@ A003 SELECT %TESTNUMBER
 A004 FETCH 123 BODY[1]\r
 A005 LOGOUT\r
 </protocol>
-<file name="log/head-%TESTNUMBER">
+<file name="%LOGDIR/head-%TESTNUMBER">
         _   _ ____  _     \r
     ___| | | |  _ \| |    \r
    / __| | | | |_) | |    \r

diff --git a/tests/data/test9 b/tests/data/test9
index fc53b70435f84083f0bd9e668f33a8482e24ecd7..b37accbcc046a08a6e07a44db8c3f87db6a8abf7 100644 (file)
--- a/tests/data/test9
+++ b/tests/data/test9
@@ -30,10 +30,10 @@ http
 HTTP RFC1867-type formposting
  </name>
  <command>
-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
 </command>
 # We create this file before the command is invoked!
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 foo-
 This is a moo-
 bar

diff --git a/tests/data/test909 b/tests/data/test909
index d50ab8131799a96c6d00547ffdea1861d30fcf02..6fa4b28d80891a690e526997896ab9690b2ecffa 100644 (file)
--- a/tests/data/test909
+++ b/tests/data/test909
@@ -19,14 +19,14 @@ smtp
  <name>
 SMTP without SIZE support
  </name>
-<file name="log/test%TESTNUMBER.eml">
+<file name="%LOGDIR/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
  <command>
-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
 </command>
 </client>
 

diff --git a/tests/data/test912 b/tests/data/test912
index 4a3f6d16f241cec3d65e8396cc22439ab060a828..dd34a46ea52e961c64a4792691bfbe1e6710d679 100644 (file)
--- a/tests/data/test912
+++ b/tests/data/test912
@@ -23,14 +23,14 @@ smtp
  <name>
 SMTP with SIZE support
  </name>
-<file name="log/test%TESTNUMBER.eml">
+<file name="%LOGDIR/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
  <command>
-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
 </command>
 </client>
 

diff --git a/tests/data/test913 b/tests/data/test913
index 9c19eb2dc9516c3a80c3f5004f17a98219300d31..48beac64cef3421d1efa93f49b8cc37e61505fcc 100644 (file)
--- a/tests/data/test913
+++ b/tests/data/test913
@@ -23,14 +23,14 @@ smtp
  <name>
 SMTP with large message SIZE
  </name>
-<file name="log/test%TESTNUMBER.eml">
+<file name="%LOGDIR/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
  <command>
-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
 </command>
 </client>
 

diff --git a/tests/data/test914 b/tests/data/test914
index ab895d2cd86c6f052b79c3f82fef15607a762402..1843af9fe490554a38a2ffc4d429513527878736 100644 (file)
--- a/tests/data/test914
+++ b/tests/data/test914
@@ -22,14 +22,14 @@ smtp
  <name>
 SMTP invalid --mail-from
  </name>
-<file name="log/test%TESTNUMBER.eml">
+<file name="%LOGDIR/test%TESTNUMBER.eml">
 From: different\r
 To: another\r
 \r
 body\r
 </file>
  <command>
-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
 </command>
 </client>
 

diff --git a/tests/data/test938 b/tests/data/test938
index ec19998c0242e121cccf143972e735fba5b9bd9b..0137b7a0cd04d5a9a55e4400c868aefa0e6b432f 100644 (file)
--- a/tests/data/test938
+++ b/tests/data/test938
@@ -30,11 +30,11 @@ smtp
  <name>
 SMTP multiple connection authentication
  </name>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 mail body\r
 </file>
  <command>
-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
 </command>
 </client>
 

diff --git a/tests/data/test941 b/tests/data/test941
index f4dc34faea279651765ec31ca42b0a06529c1246..a9838375168a271687512f8d9c9d36a6596a5aa7 100644 (file)
--- a/tests/data/test941
+++ b/tests/data/test941
@@ -20,7 +20,7 @@ smtp
  <name>
 SMTP with --crlf
  </name>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 From: different
 To: another
 
@@ -34,7 +34,7 @@ the
 --crlf option
 </file>
  <command>
-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
 </command>
 </client>
 

diff --git a/tests/data/test96 b/tests/data/test96
index 27044bc996e7a62676b441b7d69af2e7014cbdaf..2bf68cc4bf20690469642dd1df61ce8ec40ae7df 100644 (file)
--- a/tests/data/test96
+++ b/tests/data/test96
@@ -30,7 +30,7 @@ curl memory tracking operational
 #
 # Verify data after the test has been "shot"
 <verify>
-<file name="log/memdump">
+<file name="%LOGDIR/memdump">
 MEM tool_paramhlp.c
 MEM tool_cfgable.c
 MEM tool_cfgable.c

diff --git a/tests/data/test970 b/tests/data/test970
index 37945269a19cd0021e5e0298d8bdf34d9bd93f4b..74c7cb3d6d2150a70ee95012869a814c2897f3c2 100644 (file)
--- a/tests/data/test970
+++ b/tests/data/test970
@@ -44,7 +44,7 @@ CURL_VERSION=curl-unit-test-fake-version
 HTTP GET with JSON output
 </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{json}' -o log/out%TESTNUMBER
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --write-out '%{json}' -o %LOGDIR/out%TESTNUMBER
 </command>
 </client>
 
@@ -59,7 +59,7 @@ Accept: */*
 \r
 </protocol>
 <stdout nonewline="yes">
-{"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"}
 </stdout>
 </verify>
 </testcase>

diff --git a/tests/data/test972 b/tests/data/test972
index b62eb5bde8e7940534c51e15f1ab0110a9948bed..7ab134806ae94bab6d6677f7d4a692638393e905 100644 (file)
--- a/tests/data/test972
+++ b/tests/data/test972
@@ -45,7 +45,7 @@ CURL_VERSION=curl-unit-test-fake-version
 Verify JSON output
 </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER -s --write-out '%{json}\n' -o log/out972
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER -s --write-out '%{json}\n' -o %LOGDIR/out972
 </command>
 </client>
 
@@ -60,7 +60,7 @@ Accept: */*
 \r
 </protocol>
 <stdout mode="text">
-{"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"}
 </stdout>
 </verify>
 </testcase>

diff --git a/tests/data/test977 b/tests/data/test977
index 65167ee0ee0268cb2fbbc9d8662e3dd231612584..145a81ba34906be7b5aa3d55315ef12b4726cef4 100644 (file)
--- 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
  </name>
  <command>
--x http://%HOSTIP:%HTTPPORT http://firsthost.me. -c log/cookies%TESTNUMBER
+-x http://%HOSTIP:%HTTPPORT http://firsthost.me. -c %LOGDIR/cookies%TESTNUMBER
 </command>
 </client>
 
@@ -52,7 +52,7 @@ Accept: */*
 Proxy-Connection: Keep-Alive\r
 \r
 </protocol>
-<file name="log/cookies%TESTNUMBER" mode="text">
+<file name="%LOGDIR/cookies%TESTNUMBER" mode="text">
 # 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 105fa78c5f270a0bd68fb653ca4cc43f24ff6ecb..16e55920d6b5e55a5264ed349e3d23f0c33e7798 100644 (file)
--- a/tests/data/test978
+++ b/tests/data/test978
@@ -35,7 +35,7 @@ http
 verify that --stderr works for -w's stderr as well
  </name>
  <command>
-http://%HOSTIP:%HTTPPORT/%TESTNUMBER --stderr log/redir --silent -w '%{stderr}nonsense\n'
+http://%HOSTIP:%HTTPPORT/%TESTNUMBER --stderr %LOGDIR/redir --silent -w '%{stderr}nonsense\n'
 </command>
 </client>
 
@@ -49,7 +49,7 @@ User-Agent: curl/%VERSION
 Accept: */*
 
 </protocol>
-<file name="log/redir" mode="text">
+<file name="%LOGDIR/redir" mode="text">
 nonsense
 </file>
 </verify>

diff --git a/tests/data/test981 b/tests/data/test981
index 2b98ce42ad4cf70ebdab389e2d5812b9682e289a..e7941af532d7086b5bb64e8ffa1d91a3023dc63a 100644 (file)
--- a/tests/data/test981
+++ b/tests/data/test981
@@ -29,9 +29,9 @@ imap
 IMAP STARTTLS pipelined server response
  </name>
  <command>
-imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T log/upload%TESTNUMBER -u user:secret --ssl
+imap://%HOSTIP:%IMAPPORT/%TESTNUMBER -T %LOGDIR/upload%TESTNUMBER -u user:secret --ssl
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
 From: Fred Foobar <foobar@example.COM>
 Subject: afternoon meeting

diff --git a/tests/data/test983 b/tests/data/test983
index 300ec459c99b51887b0c1ee63d8b1ce296e39c4a..203e40a3a721f07cdf84029e6f5cb00959df3da2 100644 (file)
--- a/tests/data/test983
+++ b/tests/data/test983
@@ -26,7 +26,7 @@ ftp
  <name>
 FTP STARTTLS pipelined server response
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
       see
@@ -35,7 +35,7 @@ works
   so does it?
 </file>
  <command>
---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
 </command>
 </client>
 

diff --git a/tests/data/test984 b/tests/data/test984
index e573f23c15b4507557254cbf4cf3bfcc01076408..7887b776c3321fcf0cbdd737f6f21dee290e7687 100644 (file)
--- a/tests/data/test984
+++ b/tests/data/test984
@@ -27,9 +27,9 @@ imap
 IMAP require STARTTLS with failing capabilities
  </name>
  <command>
-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
 </command>
-<file name="log/upload%TESTNUMBER">
+<file name="%LOGDIR/upload%TESTNUMBER">
 Date: Mon, 7 Feb 1994 21:52:25 -0800 (PST)
 From: Fred Foobar <foobar@example.COM>
 Subject: afternoon meeting

diff --git a/tests/data/test986 b/tests/data/test986
index a709437a49ffd406d33553359e19c1e50c6ab242..ebe12c2914be7af4ac04580a907db219983d4a33 100644 (file)
--- a/tests/data/test986
+++ b/tests/data/test986
@@ -26,7 +26,7 @@ ftp
  <name>
 FTP require STARTTLS while preauthenticated
  </name>
-<file name="log/test%TESTNUMBER.txt">
+<file name="%LOGDIR/test%TESTNUMBER.txt">
 data
     to
       see
@@ -35,7 +35,7 @@ works
   so does it?
 </file>
  <command>
---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
 </command>
 </client>
 

diff --git a/tests/runtests.pl b/tests/runtests.pl
index 5d2e590c25f12a4c361a8aef596930f20bdb9e30..f8387a7b732b9df8410048e1b09a85fc3123e0fd 100755 (executable)
--- 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) {