Skip to content

Commit 86d8a07

Browse files
committed
Merge pull request #5 from killercup/fix/travis-stuff
Fix travis stuff
2 parents e81d88d + a85d876 commit 86d8a07

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

.travis.yml

+5-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,11 @@ before_script:
1212
script:
1313
- |
1414
travis-cargo build &&
15-
env RUST_SYSROOT=$HOME/rust RUST_TEST_NOCAPTURE=1 travis-cargo test
15+
env RUST_SYSROOT=$HOME/rust travis-cargo test
1616
notifications:
1717
email:
1818
on_success: never
19+
env:
20+
global:
21+
- RUST_TEST_NOCAPTURE=1
22+
- TRAVIS_CARGO_NIGHTLY_FEATURE=""

README.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ An experimental interpreter for [Rust][rust]'s [mid-level intermediate
77
representation][mir] (MIR). This project began as part of my work for the
88
undergraduate research course at the [University of Saskatchewan][usask].
99

10+
[![Build Status](https://travis-ci.org/tsion/miri.svg?branch=master)](https://travis-ci.org/tsion/miri)
11+
1012
## Download Rust nightly
1113

1214
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),
3436
the `sysroot` path will also include your build target (e.g.
3537
`$HOME/.multirust/toolchains/nightly-2016-04-11-x86_64-apple-darwin`). You can
3638
see the current toolchain's directory by running `rustup which cargo` (ignoring
37-
the trailing `/bin/cargo).
39+
the trailing `/bin/cargo`).
3840

3941
If you installed without using multirust or rustup, you'll need to adjust the
4042
command to run your cargo and set the `sysroot` to the directory where your
@@ -58,4 +60,4 @@ additional terms or conditions.
5860
[mir]: https://github.com/rust-lang/rfcs/blob/master/text/1211-mir.md
5961
[usask]: https://www.usask.ca/
6062
[multirust]: https://github.com/brson/multirust
61-
[rustup]: https://www.rustup.rs
63+
[rustup]: https://www.rustup.rs

0 commit comments

Comments
 (0)