Enable backtraces for tests

[rust.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index fefa37b7fec46cd89b87800932c9b97dc460ee30..9aa632da05e0e976756cab9c1d054ad4a79c67f4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,54 @@
 language: rust
+cache: cargo
+
+os:
+- osx
+- linux
+
 rust:
 - nightly
 before_script:
-- |
-  pip install 'travis-cargo<0.2' --user &&
-  export PATH=$HOME/.local/bin:$PATH
-- sh ~/rust-installer/rustup.sh --add-target=i686-unknown-linux-gnu --prefix=/home/travis/rust -y --disable-sudo
-- sh ~/rust-installer/rustup.sh --add-target=i686-pc-windows-gnu --prefix=/home/travis/rust -y --disable-sudo
-- sh ~/rust-installer/rustup.sh --add-target=i686-pc-windows-msvc --prefix=/home/travis/rust p-y --disable-sudo
+# 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 xargo || echo "skipping xargo install"
+- export RUST_SYSROOT=$HOME/rust
 script:
+- set -e
+- |
+  # get ourselves a MIR-ful libstd
+  xargo/build.sh
+- |
+  # Test plain 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 &&
+  cd ..
+- |
+  # and run all tests with full mir
+  MIRI_SYSROOT=~/.xargo/HOST cargo test --release
 - |
-  env RUST_SYSROOT=$HOME/rust travis-cargo build &&
-  env RUST_SYSROOT=$HOME/rust travis-cargo test
+  # test that the rustc_tests binary compiles
+  cd rustc_tests &&
+  cargo build --release &&
+  cd ..
 notifications:
   email:
     on_success: never
+branches:
+  only:
+  - master
 env:
   global:
   - RUST_TEST_NOCAPTURE=1