From d81dbae19f8876ad472e445d89760970c79cceaa Mon Sep 17 00:00:00 2001 From: Marcel Raad Date: Sun, 20 Oct 2019 21:16:50 +0200 Subject: 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 --- tests/data/test1016 | 2 +- tests/data/test1017 | 2 +- tests/data/test1018 | 2 +- tests/data/test1019 | 2 +- tests/data/test1020 | 2 +- tests/data/test1063 | 2 +- tests/data/test1220 | 2 +- tests/data/test1445 | 2 +- tests/data/test200 | 2 +- tests/data/test2000 | 2 +- tests/data/test2001 | 2 +- tests/data/test2002 | 2 +- tests/data/test2003 | 2 +- tests/data/test2004 | 2 +- tests/data/test202 | 2 +- tests/data/test204 | 2 +- tests/data/test2071 | 2 +- tests/data/test231 | 2 +- tests/data/test288 | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) (limited to 'tests') diff --git a/tests/data/test1016 b/tests/data/test1016 index 4927f9eaa..01bf100f3 100644 --- a/tests/data/test1016 +++ b/tests/data/test1016 @@ -23,7 +23,7 @@ file X-Y range on a file:// URL to stdout --r 1-4 file://localhost/%PWD/log/test1016.txt +-r 1-4 file://localhost%FILE_PWD/log/test1016.txt 1234567890 diff --git a/tests/data/test1017 b/tests/data/test1017 index cfdd80f9e..9790d776d 100644 --- a/tests/data/test1017 +++ b/tests/data/test1017 @@ -24,7 +24,7 @@ file 0-Y range on a file:// URL to stdout --r 0-3 file://localhost/%PWD/log/test1017.txt +-r 0-3 file://localhost%FILE_PWD/log/test1017.txt 1234567890 diff --git a/tests/data/test1018 b/tests/data/test1018 index 57487014f..ddf1f2595 100644 --- a/tests/data/test1018 +++ b/tests/data/test1018 @@ -23,7 +23,7 @@ file X-X range on a file:// URL to stdout --r 4-4 file://localhost/%PWD/log/test1018.txt +-r 4-4 file://localhost%FILE_PWD/log/test1018.txt 1234567890 diff --git a/tests/data/test1019 b/tests/data/test1019 index 054e38d5d..2a92ae5cf 100644 --- a/tests/data/test1019 +++ b/tests/data/test1019 @@ -24,7 +24,7 @@ file X- range on a file:// URL to stdout --r 7- file://localhost/%PWD/log/test1019.txt +-r 7- file://localhost%FILE_PWD/log/test1019.txt 1234567890 diff --git a/tests/data/test1020 b/tests/data/test1020 index 8e03a1758..0d88532f7 100644 --- a/tests/data/test1020 +++ b/tests/data/test1020 @@ -24,7 +24,7 @@ file -Y range on a file:// URL to stdout --r -9 file://localhost/%PWD/log/test1020.txt +-r -9 file://localhost%FILE_PWD/log/test1020.txt 1234567890 diff --git a/tests/data/test1063 b/tests/data/test1063 index 2979094dc..de2085d3e 100644 --- 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 --r 4294967303- file://localhost/%PWD/log/test1063.txt +-r 4294967303- file://localhost%FILE_PWD/log/test1063.txt 1234567890 diff --git a/tests/data/test1220 b/tests/data/test1220 index 6752eb580..c8eb52cb1 100644 --- a/tests/data/test1220 +++ b/tests/data/test1220 @@ -21,7 +21,7 @@ file file:// URLs with query string -file://localhost/%PWD/log/test1220.txt?a_query=foobar#afragment +file://localhost%FILE_PWD/log/test1220.txt?a_query=foobar#afragment contents in a single file diff --git a/tests/data/test1445 b/tests/data/test1445 index f60483dcd..936c9aea6 100644 --- 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 -file://localhost/%PWD/log/test1445.dir/plainfile.txt --remote-time +file://localhost%FILE_PWD/log/test1445.dir/plainfile.txt --remote-time perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test1445.dir && \ diff --git a/tests/data/test200 b/tests/data/test200 index c27f7c095..d8adda7d8 100644 --- a/tests/data/test200 +++ b/tests/data/test200 @@ -24,7 +24,7 @@ file basic file:// file -file://localhost/%PWD/log/test200.txt +file://localhost%FILE_PWD/log/test200.txt foo diff --git a/tests/data/test2000 b/tests/data/test2000 index db1ba1330..a91dcd2c7 100644 --- a/tests/data/test2000 +++ b/tests/data/test2000 @@ -32,7 +32,7 @@ file FTP RETR followed by FILE -ftp://%HOSTIP:%FTPPORT/2000 file://localhost/%PWD/log/test2000.txt +ftp://%HOSTIP:%FTPPORT/2000 file://localhost%FILE_PWD/log/test2000.txt foo diff --git a/tests/data/test2001 b/tests/data/test2001 index 88a258ebb..9232499f9 100644 --- a/tests/data/test2001 +++ b/tests/data/test2001 @@ -49,7 +49,7 @@ file HTTP GET followed by FTP RETR followed by FILE -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 foo diff --git a/tests/data/test2002 b/tests/data/test2002 index 6dd2f9310..efe75fa3b 100644 --- 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 -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 foo diff --git a/tests/data/test2003 b/tests/data/test2003 index 09bee8e22..68ae71429 100644 --- 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 -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 foo diff --git a/tests/data/test2004 b/tests/data/test2004 index b17890b0f..5b3b68d0c 100644 --- 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 ---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 This is test data diff --git a/tests/data/test202 b/tests/data/test202 index 0b324b1d8..ad9d854d5 100644 --- a/tests/data/test202 +++ b/tests/data/test202 @@ -20,7 +20,7 @@ file two file:// URLs to stdout -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 contents in a single file diff --git a/tests/data/test204 b/tests/data/test204 index 0ed94512f..5dad0149c 100644 --- a/tests/data/test204 +++ b/tests/data/test204 @@ -16,7 +16,7 @@ file "upload" with file:// -file://localhost/%PWD/log/result204.txt -T log/upload204.txt +file://localhost%FILE_PWD/log/result204.txt -T log/upload204.txt data diff --git a/tests/data/test2071 b/tests/data/test2071 index eddfa4df7..900f0d5a8 100644 --- a/tests/data/test2071 +++ b/tests/data/test2071 @@ -24,7 +24,7 @@ file basic file:// file with "127.0.0.1" hostname -file://127.0.0.1/%PWD/log/test2070.txt +file://127.0.0.1%FILE_PWD/log/test2070.txt foo diff --git a/tests/data/test231 b/tests/data/test231 index 3d4bc7730..7254953e1 100644 --- a/tests/data/test231 +++ b/tests/data/test231 @@ -23,7 +23,7 @@ file file:// with resume -file://localhost/%PWD/log/test231.txt -C 10 +file://localhost%FILE_PWD/log/test231.txt -C 10 A01234567 diff --git a/tests/data/test288 b/tests/data/test288 index 9f8f6e121..e62eabd3c 100644 --- 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/ -file://localhost/%PWD/log/test288.txt +file://localhost%FILE_PWD/log/test288.txt foo -- cgit v1.2.3