Merge pull request #5 from killercup/fix/travis-stuff

Fix travis stuff

diff --git a/.travis.yml b/.travis.yml
index 8a35c59bfa5f4cd7bf698130fae3a9bfcfb6e5ae..598ea9852e56ee1a6a35dd8d30a78fa4f5416c22 100644 (file)
--- 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=""

diff --git a/README.md b/README.md
index 74cd0e4e4c6b3a827dfdcfa409d8ec55feb9417c..5a4e274317031561422426aa180aada9642a79ab 100644 (file)
--- 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
@@ -34,7 +36,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 +60,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