From 9fd2b47c27a3dca4da8e6e3f8162f48cbd5b60cb Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Fri, 15 Apr 2016 16:50:47 +0200 Subject: [PATCH 1/3] Fix Typo in Readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 74cd0e4e4c6b..655de829b9ca 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ If you are using [rustup][rustup] (the name of the multirust rewrite in Rust), the `sysroot` path will also include your build target (e.g. `$HOME/.multirust/toolchains/nightly-2016-04-11-x86_64-apple-darwin`). You can see the current toolchain's directory by running `rustup which cargo` (ignoring -the trailing `/bin/cargo). +the trailing `/bin/cargo`). If you installed without using multirust or rustup, you'll need to adjust the command to run your cargo and set the `sysroot` to the directory where your @@ -58,4 +58,4 @@ additional terms or conditions. [mir]: https://github.com/rust-lang/rfcs/blob/master/text/1211-mir.md [usask]: https://www.usask.ca/ [multirust]: https://github.com/brson/multirust -[rustup]: https://www.rustup.rs \ No newline at end of file +[rustup]: https://www.rustup.rs From 52775ce2d7845e69adee814c33b78670504c76d3 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Fri, 15 Apr 2016 16:50:59 +0200 Subject: [PATCH 2/3] Add Build Status to Readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 655de829b9ca..5a4e27431703 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ An experimental interpreter for [Rust][rust]'s [mid-level intermediate representation][mir] (MIR). This project began as part of my work for the undergraduate research course at the [University of Saskatchewan][usask]. +[![Build Status](https://travis-ci.org/tsion/miri.svg?branch=master)](https://travis-ci.org/tsion/miri) + ## Download Rust nightly I currently recommend that you install [multirust][multirust] and then use it to From a85d876bcd87fbd41eb631f83b657d4105c20ac4 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Fri, 15 Apr 2016 16:50:36 +0200 Subject: [PATCH 3/3] Fix Travis Config for Nightly --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8a35c59bfa5f..598ea9852e56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,7 +12,11 @@ before_script: script: - | travis-cargo build && - env RUST_SYSROOT=$HOME/rust RUST_TEST_NOCAPTURE=1 travis-cargo test + env RUST_SYSROOT=$HOME/rust travis-cargo test notifications: email: on_success: never +env: + global: + - RUST_TEST_NOCAPTURE=1 + - TRAVIS_CARGO_NIGHTLY_FEATURE=""