Skip to content

Commit

Permalink
Auto merge of #882 - RalfJung:miri-rustc, r=RalfJung
Browse files Browse the repository at this point in the history
install xargo from git temporarily

This is so that once japaric/xargo#246 landed, we can see if that helps with rust-lang/rust#63162.
  • Loading branch information
bors committed Aug 4, 2019
2 parents d9d6df9 + 162c0ff commit 843691d
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions src/bin/cargo-miri.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ use std::fs::{self, File};
use std::io::{self, Write, BufRead};
use std::path::{PathBuf, Path};
use std::process::Command;
use std::ops::Not;

const CARGO_MIRI_HELP: &str = r#"Interprets bin crates and tests in Miri
Expand Down Expand Up @@ -249,9 +250,10 @@ fn setup(ask_user: bool) {
println!("Installing xargo: `cargo install xargo -f`");
}

if !cargo().args(&["install", "xargo", "-f"]).status()
// FIXME: Install from crates.io again once a new xargo got released.
if cargo().args(&["install", "xargo", "-f", "--git", "https://github.com/japaric/xargo"]).status()
.expect("failed to install xargo")
.success()
.success().not()
{
show_error(format!("Failed to install xargo"));
}
Expand Down Expand Up @@ -325,9 +327,9 @@ path = "lib.rs"
command.arg("--target").arg(&target);
}
// Finally run it!
if !command.status()
if command.status()
.expect("failed to run xargo")
.success()
.success().not()
{
show_error(format!("Failed to run xargo"));
}
Expand Down

0 comments on commit 843691d

Please sign in to comment.