Unverified Commit b842fa31 authored Aug 30, 2018 by Marcel Raad

Don't use Windows path %PWD for SSH tests

All these tests failed on Windows because something like
sftp://%HOSTIP:%SSHPORT%PWD/
expanded to
sftp://127.0.0.1:1234c/msys64/home/bla/curl
and then curl complained about the port number ending with a letter.

Use the original POSIX path instead of the Windows path created in
checksystem to fix this.

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

parent c10f5b02

tests/data/test1446

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,7 @@ perl %SRCDIR/libtest/test613.pl prepare %PWD/log/test1446.dir
	SFTP with --remote-time		SFTP with --remote-time
	</name>		</name>
	<command>		<command>
	--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%PWD/log/test1446.dir/rofile.txt --insecure --remote-time		--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/test1446.dir/rofile.txt --insecure --remote-time
	</command>		</command>
	<postcheck>		<postcheck>
	perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test1446.dir && \		perl %SRCDIR/libtest/test613.pl postprocess %PWD/log/test1446.dir && \

tests/data/test2004

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -30,7 +30,7 @@ sftp
	TFTP RRQ followed by SFTP retrieval followed by FILE followed by SCP retrieval then again in reverse order		TFTP RRQ followed by SFTP retrieval followed by FILE followed by SCP retrieval then again in reverse order
	</name>		</name>
	<command>		<command>
	--key curl_client_key --pubkey curl_client_key.pub -u %USER: tftp://%HOSTIP:%TFTPPORT//2004 sftp://%HOSTIP:%SSHPORT%PWD/log/test2004.txt file://localhost/%PWD/log/test2004.txt scp://%HOSTIP:%SSHPORT%PWD/log/test2004.txt file://localhost/%PWD/log/test2004.txt sftp://%HOSTIP:%SSHPORT%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/%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
	</command>		</command>
	<file name="log/test2004.txt">		<file name="log/test2004.txt">
	This is test data		This is test data

tests/data/test582

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,7 @@ lib582
	SFTP upload using multi interface		SFTP upload using multi interface
	</name>		</name>
	<command>		<command>
	Sftp://%HOSTIP:%SSHPORT%PWD/log/upload582.txt %PWD/log/file582.txt %USER:		Sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/upload582.txt %PWD/log/file582.txt %USER:
	</command>		</command>
	<file name="log/file582.txt">		<file name="log/file582.txt">
	Moooooooooooo		Moooooooooooo

tests/data/test583

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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		# name resolve will cause it to return rather quickly and thus we could trigger
	# the problem we're looking to verify.		# the problem we're looking to verify.
	<command>		<command>
	sftp://localhost:%SSHPORT%PWD/log/upload583.txt %USER:		sftp://localhost:%SSHPORT%POSIX_PWD/log/upload583.txt %USER:
	</command>		</command>
	</client>		</client>

tests/data/test600

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -24,7 +24,7 @@ sftp
	SFTP retrieval		SFTP retrieval
	</name>		</name>
	<command>		<command>
	--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%PWD/log/file600.txt --insecure		--key curl_client_key --pubkey curl_client_key.pub -u %USER: sftp://%HOSTIP:%SSHPORT%POSIX_PWD/log/file600.txt --insecure
	</command>		</command>
	<file name="log/file600.txt">		<file name="log/file600.txt">
	Test data		Test data