Skip to content

Commit fa0f7e0

Browse files
authored
Merge pull request #612 from theKidOfArcrania/master
Add tests for verbatim paths on windows builds
2 parents b31d50e + 12795d2 commit fa0f7e0

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

.github/workflows/main.yml

+10
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ jobs:
1919
- target: aarch64-unknown-linux-gnu
2020
os: ubuntu-latest
2121
rust: nightly
22+
- target: aarch64-pc-windows-msvc
23+
os: windows-latest
24+
rust: nightly
25+
test_verbatim: 1
26+
no_std: 1
2227
- target: arm-unknown-linux-gnueabi
2328
os: ubuntu-latest
2429
rust: nightly
@@ -78,9 +83,11 @@ jobs:
7883
- target: i686-pc-windows-msvc
7984
os: windows-latest
8085
rust: nightly
86+
test_verbatim: 1
8187
- target: x86_64-pc-windows-msvc
8288
os: windows-latest
8389
rust: nightly
90+
test_verbatim: 1
8491
- target: i686-pc-windows-gnu
8592
os: windows-latest
8693
rust: nightly-i686-gnu
@@ -109,6 +116,9 @@ jobs:
109116
- run: ./ci/run.sh ${{ matrix.target }}
110117
if: matrix.os != 'ubuntu-latest'
111118
shell: bash
119+
env:
120+
NO_STD: ${{ matrix.no_std }}
121+
TEST_VERBATIM: ${{ matrix.test_verbatim }}
112122

113123
# Otherwise we use our docker containers to run builds
114124
- run: cargo generate-lockfile && ./ci/run-docker.sh ${{ matrix.target }}

ci/run.sh

+5
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@ else
3232
$run --features no-f16-f128 --release
3333
fi
3434

35+
if [ "${TEST_VERBATIM:-}" = "1" ]; then
36+
verb_path=$(cmd.exe //C echo \\\\?\\%cd%\\testcrate\\target2)
37+
cargo build --manifest-path testcrate/Cargo.toml --target $target --target-dir $verb_path --features c
38+
fi
39+
3540
if [ -d /builtins-target ]; then
3641
rlib_paths=/builtins-target/"${target}"/debug/deps/libcompiler_builtins-*.rlib
3742
else

0 commit comments

Comments
 (0)