Reftests: handle cygwin paths #5286
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
rjbou
added
PR: QUEUED
rjbou
removed
the
PR: QUEUED
kit-ty-kate
force-pushed
the
rftst-cygpre
branch
from
9eebb1e
to
e46cc0c
Compare
kit-ty-kate
reviewed
Sep 20, 2022
1 task
dra27
reviewed
Feb 8, 2023
| OpamSystem.read_command_output ([ "cygpath" ] @ args) | ||
| with | ||
| | x::_ when not (String.equal x "") && f x -> | ||
| Some OpamSystem.(back_to_forward x, forward_to_back x) |
There was a problem hiding this comment.
This feels slightly over-kill. cygpath -u will always return forward-slashes and cygpath -w will always return back-slashes.
| (* Some outputs contain both Windows-like path C:\ and cygwin-like path /cygdrive/c *) | ||
| let cygwinpath = | ||
| match get_cygwinpath dir with | ||
| | Some (cwp_fwd, cwp_bck) -> [ str cwp_fwd ; str cwp_bck ] |
There was a problem hiding this comment.
I don't think we should further normalise Cygwin-paths containing backslashes (that feels like an error somewhere)
| in | ||
| let winpath = | ||
| match get_winpath dir with | ||
| | Some (wp_fwd, wp_bck) -> [ str wp_fwd ; str wp_bck ] |
There was a problem hiding this comment.
I'd like us to get to the stage where we only see properly formatted Windows paths, but supporting all \ and all / but not mixed seems a little strange. How about this instead: we know that get_winpath will return only backslashes, so we can split the string on \ and then construct seq [ component1 (set "\\/") component2 (set "\\/") .. ]?
Co-authored-by: David Allsopp <david.allsopp@metastack.com>
|
supersede by #5723 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Some windows paths were not prefixed with cygwin path, and then not catch by path regexp.
Also, for some tests we get
PATHfrom environment that is in cygwin style whileSys.getcwdgives the windows style one. Add inBASEDIRregexp both style.