Skip to content

Commit aeefbb9

Browse files
committed
Auto merge of #1251 - RalfJung:win-cross, r=<try>
cross-test on a Windows host
2 parents d7d2266 + c7f8fed commit aeefbb9

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

.appveyor.yml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ environment:
22
global:
33
PROJECT_NAME: miri
44
matrix:
5-
- TARGET: x86_64-pc-windows-msvc
65
- TARGET: i686-pc-windows-msvc
76

87
# branches to build
@@ -43,18 +42,33 @@ build_script:
4342
# Build and install miri
4443
- cargo build --release --all-features --all-targets --locked
4544
- cargo install --all-features --force --path . --locked --offline
46-
# Get ourselves a MIR-full libstd, and use it henceforth
47-
- cargo miri setup
48-
- set MIRI_SYSROOT=%USERPROFILE%\AppData\Local\rust-lang\miri\cache\HOST
4945

5046
test_script:
5147
- set RUST_TEST_NOCAPTURE=1
5248
- set RUST_BACKTRACE=1
53-
# Test miri
49+
# Test host miri: 32bit Windows
50+
- cargo miri setup
51+
- set MIRI_SYSROOT=%USERPROFILE%\AppData\Local\rust-lang\miri\cache\HOST
52+
- cargo test --release --all-features --locked
53+
- cd test-cargo-miri
54+
- '"C:\msys64\mingw64\bin\python3.exe" run-test.py'
55+
- cd ..
56+
# Test foreign miri: 64bit Linux
57+
- cargo miri setup --target x86_64-unknown-linux-gnu
58+
- set MIRI_SYSROOT=%USERPROFILE%\AppData\Local\rust-lang\miri\cache
59+
- set MIRI_TEST_TARGET=x86_64-unknown-linux-gnu
60+
- cargo test --release --all-features --locked
61+
- cd test-cargo-miri
62+
- '"C:\msys64\mingw64\bin\python3.exe" run-test.py'
63+
- cd ..
64+
# Test foreign miri: 64bit macOS
65+
- cargo miri setup --target x86_64-apple-darwin
66+
- set MIRI_SYSROOT=%USERPROFILE%\AppData\Local\rust-lang\miri\cache
67+
- set MIRI_TEST_TARGET=x86_64-apple-darwin
5468
- cargo test --release --all-features --locked
55-
# Test cargo integration
5669
- cd test-cargo-miri
5770
- '"C:\msys64\mingw64\bin\python3.exe" run-test.py'
71+
- cd ..
5872

5973
after_test:
6074
# Don't cache "master" toolchain, it's a waste

0 commit comments

Comments
 (0)