Enable backtraces for tests

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index d42ef2287af3c1f56649129b99f76edb364fc8b8..9aa632da05e0e976756cab9c1d054ad4a79c67f4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,23 @@
 language: rust
+cache: cargo
+
+os:
+- osx
+- linux
+
 rust:
 - nightly
 before_script:
+# mac os weirdness (https://github.com/travis-ci/travis-ci/issues/6307)
+- curl -sSL https://rvm.io/mpapis.asc | gpg --import -
+- rvm get stable
+# actual travis code
 - export PATH=$HOME/.local/bin:$PATH
 - rustup target add i686-unknown-linux-gnu
 - rustup target add i686-pc-windows-gnu
 - rustup target add i686-pc-windows-msvc
 - rustup component add rust-src
-- cargo install --git https://github.com/japaric/xargo.git
+- cargo install xargo || echo "skipping xargo install"
 - export RUST_SYSROOT=$HOME/rust
 script:
 - set -e
@@ -16,14 +26,14 @@ script:
   xargo/build.sh
 - |
   # Test plain miri
-  cargo build --locked --release --features "cargo_miri" &&
-  cargo test --release --all &&
-  cargo install --features "cargo_miri"
+  cargo build --release --all-features &&
+  RUST_BACKTRACE=1 cargo test --release --all-features --all &&
+  cargo install --all-features --force
 - |
   # Test cargo miri
   cd cargo-miri-test &&
   cargo miri &&
-  cargo miri test &&
+  #cargo miri test &&
   cd ..
 - |
   # and run all tests with full mir
@@ -31,7 +41,7 @@ script:
 - |
   # test that the rustc_tests binary compiles
   cd rustc_tests &&
-  cargo build --locked --release &&
+  cargo build --release &&
   cd ..
 notifications:
   email: