Fix references to Windows drive letter#54
Closed
raneashay wants to merge 3 commits intomicrosoft:mainfrom
Closed
Conversation
Prior to this patch, both the build and the tests included several references to C:/. References in the build assumed that Windows is installed on C:/, which causes the build to fail when Windows is installed on a different drive. The references among tests assumed that the C:/ drive exists, which although mostly correct, is not guaranteed, making the tests fragile. This patch fixes the build references to use the `SYSTEMROOT` environment variable, which points to the Windows installation path, instead of hardcoded references to C:/Windows. This patch also updates tests to not use the presence of C:/ to detect Windows (instead relying on the output of `uname -s`) and to not assume that every Windows installation has a C:/.
swesonga
reviewed
Mar 24, 2026
make/scripts/fixpath.sh
Outdated
Member
There was a problem hiding this comment.
Does this C:/ prefix need to be removed as well?
swesonga
reviewed
Mar 24, 2026
make/scripts/fixpath.sh
Outdated
| if [[ -z ${CMD+x} ]]; then | ||
| CMD="$DRIVEPREFIX/c/windows/system32/cmd.exe" | ||
| # Use SYSTEMROOT to find Windows directory regardless of drive letter | ||
| systemroot_unix="$($PATHTOOL -u "$SYSTEMROOT")" |
Member
There was a problem hiding this comment.
The variable name systemroot_unix seems a bit odd (IMHO) for the Windows case but that's ok
1. Removed reference to c:/ in fixpath.sh 2. Renamed `systemroot_unix` to `systemroot`
Author
|
Thanks Saint! Fixed both issues in the most recent commit. |
Author
|
If |
raneashay
commented
Mar 31, 2026
make/scripts/fixpath.sh
Outdated
| DRIVEPREFIX="${winroot%/c/}" | ||
| drive_letter="${SYSTEMROOT%%:*}" | ||
| drive_letter_lower="$(echo "$drive_letter" | tr 'A-Z' 'a-z')" | ||
| systemroot="$($PATHTOOL -u "$SYSTEMROOT")" |
Author
There was a problem hiding this comment.
Use a different variable name so that there's no confusion with the OS-set env var.
Author
There was a problem hiding this comment.
Use braces when referencing env vars wherever possible.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Prior to this patch, both the build and the tests included several
references to C:/. References in the build assumed that Windows is
installed on C:/, which causes the build to fail when Windows is
installed on a different drive. The references among tests assumed that
the C:/ drive exists, which although mostly correct, is not guaranteed,
making the tests fragile.
This patch fixes the build references to use the
SYSTEMROOTenvironment variable, which points to the Windows installation path,
instead of hardcoded references to C:/Windows. This patch also updates
tests to not use the presence of C:/ to detect Windows (instead relying
on the output of
uname -s) and to not assume that every Windowsinstallation has a C:/.