Skip to content

Commit

Permalink
Merge pull request #5 from killercup/fix/travis-stuff
Browse files Browse the repository at this point in the history
Fix travis stuff
  • Loading branch information
solson committed Apr 15, 2016
2 parents e81d88d + a85d876 commit 86d8a07
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
6 changes: 5 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
[rustup]: https://www.rustup.rs

0 comments on commit 86d8a07

Please sign in to comment.