tests: use %FILE_PWD for file:// URLs

This way, we always have exactly one slash after the host name, making
the tests pass when curl is compiled with the MSYS GCC.

Closes https://github.com/curl/curl/pull/4512

diff --git a/tests/data/test1016 b/tests/data/test1016
index 4927f9eaa8f9bd03c9e5fc6ef98e5fa0baa9cd5b..01bf100f3ce09bc574e8a6f17962490fcfafcc19 100644 (file)
--- a/tests/data/test1016
+++ b/tests/data/test1016
@@ -23,7 +23,7 @@ file
 X-Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 1-4 file://localhost/%PWD/log/test1016.txt 
+-r 1-4 file://localhost%FILE_PWD/log/test1016.txt 
 </command>
 <file name="log/test1016.txt">
 1234567890

diff --git a/tests/data/test1017 b/tests/data/test1017
index cfdd80f9e2a5b63426c9f9f4d2f39a58ae946275..9790d776d7a9c34a086b5e15558352cb188f45bb 100644 (file)
--- a/tests/data/test1017
+++ b/tests/data/test1017
@@ -24,7 +24,7 @@ file
 0-Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 0-3 file://localhost/%PWD/log/test1017.txt 
+-r 0-3 file://localhost%FILE_PWD/log/test1017.txt 
 </command>
 <file name="log/test1017.txt">
 1234567890

diff --git a/tests/data/test1018 b/tests/data/test1018
index 57487014fb35623ea836f62d27bf37bac756abf8..ddf1f2595d31616646bf1ea2516347f6684b549f 100644 (file)
--- a/tests/data/test1018
+++ b/tests/data/test1018
@@ -23,7 +23,7 @@ file
 X-X range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 4-4 file://localhost/%PWD/log/test1018.txt 
+-r 4-4 file://localhost%FILE_PWD/log/test1018.txt 
 </command>
 <file name="log/test1018.txt">
 1234567890

diff --git a/tests/data/test1019 b/tests/data/test1019
index 054e38d5d72d7ecd8cb9d55ac80f048a11f44dd2..2a92ae5cf7e72c7bc36a23acfe194bd4e08b4580 100644 (file)
--- a/tests/data/test1019
+++ b/tests/data/test1019
@@ -24,7 +24,7 @@ file
 X- range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r 7- file://localhost/%PWD/log/test1019.txt 
+-r 7- file://localhost%FILE_PWD/log/test1019.txt 
 </command>
 <file name="log/test1019.txt">
 1234567890

diff --git a/tests/data/test1020 b/tests/data/test1020
index 8e03a1758b22f0ac357c820cf0f9e778d6eb0c36..0d88532f715759de8979b8c9d49eb9aaaf17cf0a 100644 (file)
--- a/tests/data/test1020
+++ b/tests/data/test1020
@@ -24,7 +24,7 @@ file
 -Y range on a file:// URL to stdout
  </name>
 <command option="no-include">
--r -9 file://localhost/%PWD/log/test1020.txt 
+-r -9 file://localhost%FILE_PWD/log/test1020.txt 
 </command>
 <file name="log/test1020.txt">
 1234567890

diff --git a/tests/data/test1063 b/tests/data/test1063
index 2979094dcf6ae7c8d507ea704dbc56238bcc399e..de2085d3ec053055ad715ca3febd56b789c0f7f5 100644 (file)
--- a/tests/data/test1063
+++ b/tests/data/test1063
@@ -28,7 +28,7 @@ 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/%PWD/log/test1063.txt 
+-r 4294967303- file://localhost%FILE_PWD/log/test1063.txt 
 </command>
 <file name="log/test1063.txt">
 1234567890

diff --git a/tests/data/test1220 b/tests/data/test1220
index 6752eb5804eb40e55c2336d87624e1deb0f604c9..c8eb52cb1c40a3d81c0209008e1cad7a140cdf1f 100644 (file)
--- a/tests/data/test1220
+++ b/tests/data/test1220
@@ -21,7 +21,7 @@ file
 file:// URLs with query string
  </name>
 <command option="no-include">
-file://localhost/%PWD/log/test1220.txt?a_query=foobar#afragment
+file://localhost%FILE_PWD/log/test1220.txt?a_query=foobar#afragment
 </command>
 <file name="log/test1220.txt">
 contents in a single file

diff --git a/tests/data/test1445 b/tests/data/test1445
index f60483dcdad01238008912ad0fcd79e708260d63..936c9aea6e706039a8ecd4d6c5a5f2bcf2cf870e 100644 (file)
--- a/tests/data/test1445
+++ b/tests/data/test1445
@@ -21,7 +21,7 @@ perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test1445.dir
 file:// with --remote-time
  </name>
  <command>
-file://localhost/%PWD/log/test1445.dir/plainfile.txt --remote-time
+file://localhost%FILE_PWD/log/test1445.dir/plainfile.txt --remote-time
 </command>
 <postcheck>
 perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test1445.dir && \

diff --git a/tests/data/test200 b/tests/data/test200
index c27f7c095d22905c25c3cd4b2b871d8f847131ff..d8adda7d817ebc1d5eb13d9939feaa19b8fccf51 100644 (file)
--- a/tests/data/test200
+++ b/tests/data/test200
@@ -24,7 +24,7 @@ file
 basic file:// file
  </name>
 <command option="no-include">
-file://localhost/%PWD/log/test200.txt
+file://localhost%FILE_PWD/log/test200.txt
 </command>
 <file name="log/test200.txt">
 foo

diff --git a/tests/data/test2000 b/tests/data/test2000
index db1ba1330482e43a5a7068a12505f2b9349226c1..a91dcd2c762c704cd8534581e7c359ff18578a09 100644 (file)
--- a/tests/data/test2000
+++ b/tests/data/test2000
@@ -32,7 +32,7 @@ file
 FTP RETR followed by FILE
  </name>
 <command option="no-include">
-ftp://%HOSTIP:%FTPPORT/2000 file://localhost/%PWD/log/test2000.txt
+ftp://%HOSTIP:%FTPPORT/2000 file://localhost%FILE_PWD/log/test2000.txt
 </command>
 <file name="log/test2000.txt">
 foo

diff --git a/tests/data/test2001 b/tests/data/test2001
index 88a258ebb838b1153af2bba0d628d64c0fe57e80..9232499f9e92f6dc5e035d232a2e6d541fb5acf5 100644 (file)
--- a/tests/data/test2001
+++ b/tests/data/test2001
@@ -49,7 +49,7 @@ file
 HTTP GET followed by FTP RETR followed by FILE
  </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/20010001 ftp://%HOSTIP:%FTPPORT/20010002 file://localhost/%PWD/log/test2001.txt
+http://%HOSTIP:%HTTPPORT/20010001 ftp://%HOSTIP:%FTPPORT/20010002 file://localhost%FILE_PWD/log/test2001.txt
 </command>
 <file name="log/test2001.txt">
 foo

diff --git a/tests/data/test2002 b/tests/data/test2002
index 6dd2f9310a15a9c7c292fb9c648bb557c4cf3d60..efe75fa3b09452fd238465804e52e2cd9e7b45f9 100644 (file)
--- a/tests/data/test2002
+++ b/tests/data/test2002
@@ -58,7 +58,7 @@ tftp
 HTTP GET followed by FTP RETR followed by FILE followed by TFTP RRQ
  </name>
 <command option="no-include">
-http://%HOSTIP:%HTTPPORT/20020001 ftp://%HOSTIP:%FTPPORT/20020002 file://localhost/%PWD/log/test2002.txt tftp://%HOSTIP:%TFTPPORT//20020003
+http://%HOSTIP:%HTTPPORT/20020001 ftp://%HOSTIP:%FTPPORT/20020002 file://localhost%FILE_PWD/log/test2002.txt tftp://%HOSTIP:%TFTPPORT//20020003
 </command>
 <file name="log/test2002.txt">
 foo

diff --git a/tests/data/test2003 b/tests/data/test2003
index 09bee8e22066956ec4101d936c1adbcfb8c5e1e7..68ae7142916472bc205b517f41bb20a612cbabf6 100644 (file)
--- a/tests/data/test2003
+++ b/tests/data/test2003
@@ -58,7 +58,7 @@ 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/20030001 ftp://%HOSTIP:%FTPPORT/20030002 file://localhost/%PWD/log/test2003.txt tftp://%HOSTIP:%TFTPPORT//20030003 tftp://%HOSTIP:%TFTPPORT//20030003 file://localhost/%PWD/log/test2003.txt ftp://%HOSTIP:%FTPPORT/20030002 http://%HOSTIP:%HTTPPORT/20030001
+http://%HOSTIP:%HTTPPORT/20030001 ftp://%HOSTIP:%FTPPORT/20030002 file://localhost%FILE_PWD/log/test2003.txt tftp://%HOSTIP:%TFTPPORT//20030003 tftp://%HOSTIP:%TFTPPORT//20030003 file://localhost%FILE_PWD/log/test2003.txt ftp://%HOSTIP:%FTPPORT/20030002 http://%HOSTIP:%HTTPPORT/20030001
 </command>
 <file name="log/test2003.txt">
 foo

diff --git a/tests/data/test2004 b/tests/data/test2004
index b17890b0f6eb768fb560f81987b10a4107e60926..5b3b68d0c0febcf921b84587f2cb503614f2521c 100644 (file)
--- a/tests/data/test2004
+++ b/tests/data/test2004
@@ -30,7 +30,7 @@ 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//2004 sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test2004.txt file://localhost/%PWD/log/test2004.txt scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test2004.txt file://localhost/%PWD/log/test2004.txt sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test2004.txt tftp://%HOSTIP:%TFTPPORT//2004 --insecure
+--key curl_client_key --pubkey curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//2004 sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test2004.txt file://localhost%FILE_PWD/log/test2004.txt scp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test2004.txt file://localhost%FILE_PWD/log/test2004.txt sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test2004.txt tftp://%HOSTIP:%TFTPPORT//2004 --insecure
 </command>
 <file name="log/test2004.txt">
 This is test data

diff --git a/tests/data/test202 b/tests/data/test202
index 0b324b1d801f544897a7d39c4dcf9580c4a7c96e..ad9d854d54f4d815d526c79914460a9992e9bc2c 100644 (file)
--- a/tests/data/test202
+++ b/tests/data/test202
@@ -20,7 +20,7 @@ file
 two file:// URLs to stdout
  </name>
 <command option="no-include">
-file://localhost/%PWD/log/test202.txt FILE://localhost/%PWD/log/test202.txt
+file://localhost%FILE_PWD/log/test202.txt FILE://localhost%FILE_PWD/log/test202.txt
 </command>
 <file name="log/test202.txt">
 contents in a single file

diff --git a/tests/data/test204 b/tests/data/test204
index 0ed94512f934d287b92fdc4f1d9b372285edf0fd..5dad0149ca6055d1e61276d731b2de97533174d5 100644 (file)
--- a/tests/data/test204
+++ b/tests/data/test204
@@ -16,7 +16,7 @@ file
 "upload" with file://
  </name>
 <command option="no-include">
-file://localhost/%PWD/log/result204.txt -T log/upload204.txt
+file://localhost%FILE_PWD/log/result204.txt -T log/upload204.txt
 </command>
 <file name="log/upload204.txt">
 data

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

diff --git a/tests/data/test231 b/tests/data/test231
index 3d4bc7730184158c8d5fcdffc2d418bfffeb275e..7254953e15635e8708c00ef3303ba40d3ec33f58 100644 (file)
--- a/tests/data/test231
+++ b/tests/data/test231
@@ -23,7 +23,7 @@ file
 file:// with resume
  </name>
 <command option="no-include">
-file://localhost/%PWD/log/test231.txt -C 10
+file://localhost%FILE_PWD/log/test231.txt -C 10
 </command>
 <file name="log/test231.txt">
 A01234567

diff --git a/tests/data/test288 b/tests/data/test288
index 9f8f6e1219dd44c1fb607226dd9c0592cd8abe79..e62eabd3c3c55e55b5cf02beb9b6d08cbf4d3216 100644 (file)
--- a/tests/data/test288
+++ b/tests/data/test288
@@ -31,7 +31,7 @@ file:// with (unsupported) proxy, authentication and range
 all_proxy=http://fake:user@%HOSTIP:%HTTPPORT/
 </setenv>
 <command option="no-include">
-file://localhost/%PWD/log/test288.txt
+file://localhost%FILE_PWD/log/test288.txt
 </command>
 <file name="log/test288.txt">
 foo