Don't use Windows path %PWD for SSH tests #2920
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 instead of the Windows path created in checksystem to fix this. Closes
|
TODO: remove extra "instead" from commit message. The problem is still visible at https://curl.haxx.se/dev/log.cgi?id=20180824152941-32197#prob1388, but this tester has since disappeared. |
bagder
approved these changes
Aug 30, 2018
| @@ -3200,6 +3201,7 @@ sub subVariables { | |||
|
|
|||
| $$thing =~ s/%CURL/$CURL/g; | |||
| $$thing =~ s/%PWD/$pwd/g; | |||
| $$thing =~ s/%POSIX_PWD/$posix_pwd/g; | |||
There was a problem hiding this comment.
But is there a reason to keep the old one? I mean couldn't you just use this method for %PWD ?
There was a problem hiding this comment.
The Windows path version in %PWD is still required to pass to a native Windows curl in the general case, e.g. when using the FILE protocol or just local file names. The new one is only required for OpenSSH.
falconindy
pushed a commit
to falconindy/curl
that referenced
this pull request
Sep 10, 2018
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 curl#2920
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 instead of the Windows path created
in checksystem to fix this.