Skip to content

Commit 16d9435

Browse files
committed
ci: Simplify tests for verbatim paths
Rather than setting an environment variable in the workflow job based on whether or not the environment is non-MinGW Windows, we can just check this in the ci script. This was originally added in b0f1966 ("Add tests for UNC paths on windows builds") and its followup commits.
1 parent 2086325 commit 16d9435

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

.github/workflows/main.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ jobs:
5050
os: ubuntu-24.04-arm
5151
- target: aarch64-pc-windows-msvc
5252
os: windows-2025
53-
test_verbatim: 1
5453
build_only: 1
5554
- target: arm-unknown-linux-gnueabi
5655
os: ubuntu-24.04
@@ -92,10 +91,8 @@ jobs:
9291
os: macos-13
9392
- target: i686-pc-windows-msvc
9493
os: windows-2025
95-
test_verbatim: 1
9694
- target: x86_64-pc-windows-msvc
9795
os: windows-2025
98-
test_verbatim: 1
9996
- target: i686-pc-windows-gnu
10097
os: windows-2025
10198
channel: nightly-i686-gnu
@@ -106,7 +103,6 @@ jobs:
106103
needs: [calculate_vars]
107104
env:
108105
BUILD_ONLY: ${{ matrix.build_only }}
109-
TEST_VERBATIM: ${{ matrix.test_verbatim }}
110106
MAY_SKIP_LIBM_CI: ${{ needs.calculate_vars.outputs.may_skip_libm_ci }}
111107
steps:
112108
- name: Print $HOME

ci/run.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,10 @@ else
4141
"${test_builtins[@]}" --benches
4242
"${test_builtins[@]}" --benches --release
4343

44-
if [ "${TEST_VERBATIM:-}" = "1" ]; then
44+
# Validate that having a verbatim path for the target directory works
45+
# (trivial to regress using `/` in paths to build artifacts rather than
46+
# `Path::join`). MinGW does not currently support these paths.
47+
if [[ "$target" = *"windows"* ]] && [[ "$target" != *"gnu"* ]]; then
4548
verb_path=$(cmd.exe //C echo \\\\?\\%cd%\\builtins-test\\target2)
4649
"${test_builtins[@]}" --target-dir "$verb_path" --features c
4750
fi

0 commit comments

Comments
 (0)