about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2017-09-14 10:04:28 +0200
committerRalf Jung <post@ralfj.de>2017-09-14 10:04:28 +0200
commit24e45de9539c9b3cf0ef1c888df63dacb8fbbb14 (patch)
tree8fdf8c9dc42d82e7677e1763841700accf74e50f
parent91d9b83db26676bd0d178ceb9abfc53cae3907bc (diff)
downloadrust-24e45de9539c9b3cf0ef1c888df63dacb8fbbb14.tar.gz
rust-24e45de9539c9b3cf0ef1c888df63dacb8fbbb14.zip
travis: more consistent cargo flags (--locked, --release)
-rw-r--r--.travis.yml8
1 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index d42ef2287af..4ef07db0902 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,9 +16,9 @@ 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 --locked --release --all-features &&
+  cargo test --locked --release --all-features --all &&
+  cargo install --locked --release --all-features
 - |
   # Test cargo miri
   cd cargo-miri-test &&
@@ -27,7 +27,7 @@ script:
   cd ..
 - |
   # and run all tests with full mir
-  MIRI_SYSROOT=~/.xargo/HOST cargo test --release
+  MIRI_SYSROOT=~/.xargo/HOST cargo test --locked --release
 - |
   # test that the rustc_tests binary compiles
   cd rustc_tests &&