Skip to content

runtests: split SSH_PWD into SCP_PWD and SFTP_PWD, and more #17041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 6 commits into from

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Apr 12, 2025

To allow configuring paths styles for SCP and SFTP servers separately.

  • make scp:// URLs use %SCP_PWD (was: %SSH_PWD).
  • make %SCP_PWD equal to %POSIX_PWD.
    To fix test 3022 with OpenSSH-Windows 9.8.0 server.
    The fix works on a local machine. Remains broken in CI.
    Before this patch, it was equal to %FILE_PWD when using
    OpenSSH-Windows, otherwise it was %POSIX_PWD.
    Notice that no matter what path-style we pass, test 3022
    was and still is broken with earlier OpenSSH-Windows versions.
    (as tested with 9.5.0, 9.5.0-beta20240403, 8.0.0.1)
  • rename rest of %SSH_PWD uses to %SFTP_PWD.
  • drop unused %POSIX_PWD.
  • GHA/windows: test with OpenSSH-Windows server again.
    In the LibreSSL MSVC job. This job is short enough to fit the slow
    install of the built-in OpenSSH-Windows tools, if needed.

Follow-up to 1abb087 #5298
Ref: #16803

@vszakats vszakats changed the title runtests: split SSH_PWD into SFTP_PWD and SCP_PWD, and more runtests: split SSH_PWD into SCP_PWD and SFTP_PWD, and more Apr 12, 2025
@github-actions github-actions bot added the CI Continuous Integration label Apr 12, 2025
@vszakats vszakats mentioned this pull request Apr 12, 2025
@testclutch

This comment was marked as outdated.

@vszakats vszakats force-pushed the t-scp-var branch 2 times, most recently from b4b3824 to b532bb6 Compare April 13, 2025 18:29
@vszakats vszakats closed this in c2a45bf Apr 14, 2025
@vszakats vszakats deleted the t-scp-var branch April 14, 2025 00:09
nbaws pushed a commit to nbaws/curl that referenced this pull request Apr 26, 2025
To allow configuring paths styles for SCP and SFTP servers separately.

- make `scp://` URLs use `%SCP_PWD` (was: `%SSH_PWD`).
- make `%SCP_PWD` equal to `%POSIX_PWD`.
  To fix test 3022 with OpenSSH-Windows 9.8.0 server.
  The fix works on a local machine. Remains broken in CI.
  Before this patch, it was equal to `%FILE_PWD` when using
  OpenSSH-Windows, otherwise it was `%POSIX_PWD`.
  Notice that no matter what path-style we pass, test 3022
  was and still is broken with earlier OpenSSH-Windows versions.
  (as tested with 9.5.0, 9.5.0-beta20240403, 8.0.0.1)
- rename rest of `%SSH_PWD` uses to `%SFTP_PWD`.
- drop unused `%POSIX_PWD`.
- GHA/windows: test with OpenSSH-Windows server again.
  In the LibreSSL MSVC job. This job is short enough to fit the slow
  install of the built-in OpenSSH-Windows tools, if needed.

Follow-up to 1abb087 curl#5298
Ref: curl#16803
Closes curl#17041
nbaws pushed a commit to nbaws/curl that referenced this pull request Apr 26, 2025
To allow configuring paths styles for SCP and SFTP servers separately.

- make `scp://` URLs use `%SCP_PWD` (was: `%SSH_PWD`).
- make `%SCP_PWD` equal to `%POSIX_PWD`.
  To fix test 3022 with OpenSSH-Windows 9.8.0 server.
  The fix works on a local machine. Remains broken in CI.
  Before this patch, it was equal to `%FILE_PWD` when using
  OpenSSH-Windows, otherwise it was `%POSIX_PWD`.
  Notice that no matter what path-style we pass, test 3022
  was and still is broken with earlier OpenSSH-Windows versions.
  (as tested with 9.5.0, 9.5.0-beta20240403, 8.0.0.1)
- rename rest of `%SSH_PWD` uses to `%SFTP_PWD`.
- drop unused `%POSIX_PWD`.
- GHA/windows: test with OpenSSH-Windows server again.
  In the LibreSSL MSVC job. This job is short enough to fit the slow
  install of the built-in OpenSSH-Windows tools, if needed.

Follow-up to 1abb087 curl#5298
Ref: curl#16803
Closes curl#17041
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Continuous Integration SCP/SFTP tests Windows Windows-specific
Development

Successfully merging this pull request may close these issues.

2 participants