bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #103569 - RalfJung:miri-test-macos, r=Mark-Simulacrum

Browse source 
fix and (re-)enable Miri cross-target checks on macOS and Windows

Fixes https://github.com/rust-lang/rust/issues/103519
r? `@Mark-Simulacrum`
This commit is contained in:
bors 2022-11-07 17:04:06 +00:00
commit d69c33ad4c
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/bootstrap/sanity.rs
View file

@ -155,6 +155,14 @@ than building it.
continue; continue;
} }
// Some environments don't want or need these tools, such as when testing Miri.
// FIXME: it would be better to refactor this code to split necessary setup from pure sanity
// checks, and have a regular flag for skipping the latter. Also see
// <https://github.com/rust-lang/rust/pull/103569#discussion_r1008741742>.
if env::var_os("BOOTSTRAP_SKIP_TARGET_SANITY").is_some() {
continue;
}
if !build.config.dry_run { if !build.config.dry_run {
cmd_finder.must_have(build.cc(*target)); cmd_finder.must_have(build.cc(*target));
if let Some(ar) = build.ar(*target) { if let Some(ar) = build.ar(*target) {
@ -212,6 +220,14 @@ than building it.
} }
} }
// Some environments don't want or need these tools, such as when testing Miri.
// FIXME: it would be better to refactor this code to split necessary setup from pure sanity
// checks, and have a regular flag for skipping the latter. Also see
// <https://github.com/rust-lang/rust/pull/103569#discussion_r1008741742>.
if env::var_os("BOOTSTRAP_SKIP_TARGET_SANITY").is_some() {
continue;
}
if need_cmake && target.contains("msvc") { if need_cmake && target.contains("msvc") {
// There are three builds of cmake on windows: MSVC, MinGW, and // There are three builds of cmake on windows: MSVC, MinGW, and
// Cygwin. The Cygwin build does not have generators for Visual // Cygwin. The Cygwin build does not have generators for Visual

11
src/ci/docker/host-x86_64/x86_64-gnu-tools/checktools.sh
View file

@ -27,10 +27,7 @@ python3 "$X_PY" test --stage 2 src/tools/rustfmt
python3 "$X_PY" test --stage 2 src/tools/miri python3 "$X_PY" test --stage 2 src/tools/miri
# We natively run this script on x86_64-unknown-linux-gnu and x86_64-pc-windows-msvc. # We natively run this script on x86_64-unknown-linux-gnu and x86_64-pc-windows-msvc.
# Also cover some other targets (on both of these hosts) via cross-testing. # Also cover some other targets (on both of these hosts) via cross-testing.
# export BOOTSTRAP_SKIP_TARGET_SANITY=1 # we don't need `cc` for these targets
# Currently disabled -- we end up pulling in a cross-compile of LLVM (maybe python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-msvc
# just overly eager sanity checks), but in any case this won't work when python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin
# building LLVM as of this comment. unset BOOTSTRAP_SKIP_TARGET_SANITY
#python3 "$X_PY" test --stage 2 src/tools/miri --target i686-pc-windows-msvc
#FIXME(https://github.com/rust-lang/rust/issues/103519): macOS testing is currently disabled
# python3 "$X_PY" test --stage 2 src/tools/miri --target aarch64-apple-darwin