Skip to content

Commit 7c73df9

Browse files
committed
avoid recompiling miri for 2nd test run; avoid unreadable output due to backtraces
also some travis config cleanup
1 parent e10d83c commit 7c73df9

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

.travis.yml

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
language: rust
22
cache: cargo
3+
rust:
4+
- nightly
35

46
os:
5-
- osx
67
- linux
8+
- osx
79

8-
rust:
9-
- nightly
1010
before_script:
1111
# mac os weirdness (https://github.com/travis-ci/travis-ci/issues/6307)
1212
- curl -sSL https://rvm.io/mpapis.asc | gpg --import -
1313
- rvm get stable
1414
# in a cronjob, use latest (not pinned) nightly
1515
- if [ "$TRAVIS_EVENT_TYPE" = cron ]; then rustup override set nightly; fi
16-
# actual travis code
16+
# prepare
1717
- export PATH=$HOME/.local/bin:$PATH
1818
- rustup target add i686-unknown-linux-gnu
1919
- rustup target add i686-pc-windows-gnu
2020
- rustup target add i686-pc-windows-msvc
2121
- rustup component add rust-src
2222
- cargo install xargo || echo "skipping xargo install"
23-
- export RUST_SYSROOT=$HOME/rust
23+
2424
script:
2525
- set -e
2626
- |
2727
# Test and install plain miri
2828
cargo build --release --all-features &&
29-
RUST_BACKTRACE=1 cargo test --release --all-features --all &&
29+
cargo test --release --all-features &&
3030
cargo install --all-features --force
3131
- |
3232
# test that the rustc_tests binary compiles
@@ -55,7 +55,8 @@ script:
5555
cd ..
5656
- |
5757
# and run all tests with full mir
58-
cargo test --release
58+
cargo test --release --all-features
59+
5960
notifications:
6061
email:
6162
on_success: never

0 commit comments

Comments
 (0)