tests: use %LOGDIR to refer to the log directory

This will allow it be set dynamically. Ref: #10818
2023-03-28 18:20:54 -07:00 · 2023-03-28 18:20:54 -07:00 · e7a021e135
commit e7a021e135
parent 0c82fcde79
447 changed files with 1076 additions and 1070 deletions
--- 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
--- 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.
--- 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
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>

--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>
--- 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>

--- 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>

--- 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
--- 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
--- 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>

--- 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>

--- 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
--- 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
 QUIT
 </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
--- 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>

--- 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?
--- 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?
--- 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
--- 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>

--- 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
--- 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
--- 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
--- 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
--- 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
--- 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>

--- 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
--- 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>
--- 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>
--- 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>
--- 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>

--- 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
--- 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
--- 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
--- 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>
--- 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>
--- 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
--- 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

 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.
--- 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: */*

 </protocol>
-<file name="log/heads%TESTNUMBER">
+<file name="%LOGDIR/heads%TESTNUMBER">
 HTTP/1.1 200 funky chunky!
 Server: fakeit/0.9 fakeitbad/1.0
 Transfer-Encoding: chunked
--- 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?
--- 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>

--- 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>

--- 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>

--- 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
--- 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.
--- 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
--- 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
--- 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>

--- 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>
--- 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: */*

 </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.
--- 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: */*

 </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.
--- 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>

--- 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
--- 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: */*

 </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.
--- 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: */*

 </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.
--- 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>
--- 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: */*

 </protocol>
-<file name="log/base-#0">
+<file name="%LOGDIR/base-#0">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
--- 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>
--- 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
--- 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
--- 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
--- 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
--- 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: */*

 </protocol>
-<file name="log/%TESTNUMBER">
+<file name="%LOGDIR/%TESTNUMBER">
 12345
 </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
--- 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>
--- 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>
--- 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>
--- 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
--- 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>
--- 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>

--- 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
--- 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: */*

 </protocol>
-<file name="log/out%TESTNUMBER">
+<file name="%LOGDIR/out%TESTNUMBER">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 %if hyper
--- 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>

--- 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
--- 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: */*

 </protocol>
-<file name="log/outfile%TESTNUMBER_a1b2.dump">
+<file name="%LOGDIR/outfile%TESTNUMBER_a1b2.dump">
 HTTP/1.1 200 OK
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Content-Length: 6
--- 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
--- a/tests/data/test1287
+++ b/tests/data/test1287
@ -82,7 +82,7 @@ User-Agent: curl/%VERSION
 Accept: */*

 </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
--- 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>

--- 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
--- 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>
--- 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>
--- 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
--- 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: */*

 </protocol>
-<file name="log/name%TESTNUMBER">
+<file name="%LOGDIR/name%TESTNUMBER">
 12345
 </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: */*

 </protocol>
-<file name="log/name%TESTNUMBER;weird">
+<file name="%LOGDIR/name%TESTNUMBER;weird">
 12345
 </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: */*

 </protocol>
-<file name="log/name%TESTNUMBER">
+<file name="%LOGDIR/name%TESTNUMBER">
 12345
 </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>
--- 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
--- 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

 </stdin>
-<file name="log/%TESTNUMBER.txt">
+<file name="%LOGDIR/%TESTNUMBER.txt">
 GET /we/want/%TESTNUMBER HTTP/1.0

 </file>
 <command option="no-output">
-telnet://%HOSTIP:%HTTPPORT -T log/%TESTNUMBER.txt
+telnet://%HOSTIP:%HTTPPORT -T %LOGDIR/%TESTNUMBER.txt
 </command>
 </client>

--- 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>

--- 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
--- 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>
--- 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
--- 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: */*

 </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
 Date: Tue, 09 Nov 2010 14:49:00 GMT
 Server: test-server/fake
@ -67,7 +67,7 @@ Content-Type: text/html

 </file2>

-<file3 name="log/stdout%TESTNUMBER">
+<file3 name="%LOGDIR/stdout%TESTNUMBER">
 </file3>

 </verify>
--- a/Show More
+++ b/Show More