Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update Miri #65758

Merged
merged 4 commits into from
Oct 26, 2019
Merged

update Miri #65758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1166db7
update Miri
RalfJung Oct 24, 2019
f809f9e
bootstrap now takes care of installing xargo
RalfJung Oct 24, 2019
327ae38
use plain cargo to install xargo
RalfJung Oct 25, 2019
58da335
update miri
RalfJung Oct 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/bootstrap/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,8 +386,17 @@ impl Step for Miri {
extra_features: Vec::new(),
});
if let Some(miri) = miri {
let mut cargo = builder.cargo(compiler, Mode::ToolRustc, host, "install");
cargo.arg("xargo");
// Configure `cargo install` path. cargo adds a `bin/`.
cargo.env("CARGO_INSTALL_ROOT", &builder.out);

let mut cargo = Command::from(cargo);
if !try_run(builder, &mut cargo) {
return;
}

// # Run `cargo miri setup`.
// As a side-effect, this will install xargo.
let mut cargo = tool::prepare_tool_cargo(
builder,
compiler,
Expand All @@ -412,9 +421,7 @@ impl Step for Miri {
cargo.env("XARGO_RUST_SRC", builder.src.join("src"));
// Debug things.
cargo.env("RUST_BACKTRACE", "1");
// Configure `cargo install` path, and let cargo-miri know that that's where
// xargo ends up.
cargo.env("CARGO_INSTALL_ROOT", &builder.out); // cargo adds a `bin/`
// Let cargo-miri know where xargo ended up.
cargo.env("XARGO", builder.out.join("bin").join("xargo"));

let mut cargo = Command::from(cargo);
Expand Down
2 changes: 1 addition & 1 deletion src/tools/miri
Open in desktop
Submodule miri updated 21 files
+7 −2 .appveyor.yml
+2 −2 .travis.yml
+5 −3 CONTRIBUTING.md
+151 −187 Cargo.lock
+1 −1 rust-version
+4 −0 src/bin/cargo-miri.rs
+2 −6 src/eval.rs
+125 −11 src/helpers.rs
+1 −0 src/lib.rs
+3 −6 src/machine.rs
+3 −2 src/operator.rs
+8 −27 src/shims/env.rs
+12 −56 src/shims/foreign_items.rs
+19 −46 src/shims/fs.rs
+6 −16 src/shims/intrinsics.rs
+1 −1 src/shims/tls.rs
+2 −2 src/stacked_borrows.rs
+14 −21 test-cargo-miri/Cargo.lock
+0 −11 tests/compile-fail/chdir_invalid_path.rs
+23 −0 tests/run-pass/align_offset.rs
+4 −3 tests/run-pass/union-overwrite.rs