From 733f675bccbd23a38d89e66a7ae4d9e5afcdf8bd Mon Sep 17 00:00:00 2001 From: Steve Klabnik Date: Fri, 16 Nov 2018 15:14:44 -0500 Subject: [PATCH 1/4] fix cargo invocation in the readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5eb7b34425e6..5e5a7a23c6af 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ nightly). ## Running Miri on your own project('s test suite) -Install Miri as a cargo subcommand with `cargo install +nightly --all-features +Install Miri as a cargo subcommand with `cargo +nightly install --all-features --path .`. Be aware that if you used `rustup override set` to fix a particular Rust version for the miri directory, that will *not* apply to your own project directory! You have to use a consistent Rust version for building miri and your From 731f35154376e01180d2c238920033ced2a9ae34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sat, 17 Nov 2018 12:24:27 +0100 Subject: [PATCH 2/4] benchmarks: make them build again --- benches/fibonacci.rs | 4 ++-- benches/helpers/miri_helper.rs | 4 ++-- benches/repeat.rs | 4 ++-- benches/smoke.rs | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/benches/fibonacci.rs b/benches/fibonacci.rs index 90b231a32bfb..10c119d9017a 100644 --- a/benches/fibonacci.rs +++ b/benches/fibonacci.rs @@ -1,9 +1,9 @@ #![feature(test, rustc_private)] extern crate test; -use test::Bencher; +use crate::test::Bencher; mod helpers; -use helpers::*; +use crate::helpers::*; #[bench] fn fib(bencher: &mut Bencher) { diff --git a/benches/helpers/miri_helper.rs b/benches/helpers/miri_helper.rs index 0fbb46246aea..015e36c4f5ad 100644 --- a/benches/helpers/miri_helper.rs +++ b/benches/helpers/miri_helper.rs @@ -8,7 +8,7 @@ use self::miri::eval_main; use self::rustc_driver::{driver, Compilation}; use std::cell::RefCell; use std::rc::Rc; -use test::Bencher; +use crate::test::Bencher; pub struct MiriCompilerCalls<'a>(Rc>); @@ -50,7 +50,7 @@ pub fn run(filename: &str, bencher: &mut Bencher) { let entry_def_id = tcx.hir.local_def_id(entry_node_id); bencher.borrow_mut().iter(|| { - eval_main(tcx, entry_def_id, None); + eval_main(tcx, entry_def_id, false); }); state.session.abort_if_errors(); diff --git a/benches/repeat.rs b/benches/repeat.rs index f5920e83d9b0..0369b1f74cf5 100644 --- a/benches/repeat.rs +++ b/benches/repeat.rs @@ -1,9 +1,9 @@ #![feature(test, rustc_private)] extern crate test; -use test::Bencher; +use crate::test::Bencher; mod helpers; -use helpers::*; +use crate::helpers::*; #[bench] fn repeat(bencher: &mut Bencher) { diff --git a/benches/smoke.rs b/benches/smoke.rs index 1dbc4fed82f1..7d614e268298 100644 --- a/benches/smoke.rs +++ b/benches/smoke.rs @@ -1,9 +1,9 @@ #![feature(test, rustc_private)] extern crate test; -use test::Bencher; +use crate::test::Bencher; mod helpers; -use helpers::*; +use crate::helpers::*; #[bench] fn noop(bencher: &mut Bencher) { From 3102b1346808b48419d037aba0dc18f36dd22ce8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sat, 17 Nov 2018 13:57:45 +0100 Subject: [PATCH 3/4] travis: build benchmarks as well --- .travis.yml | 2 +- appveyor.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f989c7705b19..85dd50cb5e3c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,7 @@ script: - set -e - | # Test and install plain miri - cargo build --release --all-features && + cargo build --release --all-features --all-targets && cargo test --release --all-features && cargo install --all-features --force --path . - | diff --git a/appveyor.yml b/appveyor.yml index 1e9ccbdf9500..f03251e669e6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -37,7 +37,7 @@ build: false test_script: - set RUSTFLAGS=-g - set RUST_BACKTRACE=1 - - cargo build --release + - cargo build --release --all-targets --all-features - cargo test --release - set MIRI_SYSROOT=%USERPROFILE%\.xargo\HOST - cargo test --release From 18b2426b1b55cd9262a60626d0622bee57fe9396 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Sat, 17 Nov 2018 14:49:24 +0100 Subject: [PATCH 4/4] AppVeyor: consistently use --all-features --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f03251e669e6..dddf8913149b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -38,9 +38,9 @@ test_script: - set RUSTFLAGS=-g - set RUST_BACKTRACE=1 - cargo build --release --all-targets --all-features - - cargo test --release + - cargo test --release --all-features - set MIRI_SYSROOT=%USERPROFILE%\.xargo\HOST - - cargo test --release + - cargo test --release --all-features notifications: - provider: Email