Workaround rust-lang/cargo#3172

TeXitoi · Oct 7, 2016 · 0034752 · 0034752
1 parent 247bf34
commit 0034752
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,12 +9,11 @@ matrix:
 
 script:
   - cargo test
-  - if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test --no-default-features --features nightly; fi
-  # These test "almost" fail because of a bug of cargo https://github.com/rust-lang/cargo/issues/3172
-  - cargo test --package bragi
-  - cargo test --package mimir
-  - if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test --package bragi --no-default-features --features nightly; fi
-  - if [ $TRAVIS_RUST_VERSION = nightly ]; then cargo test --package mimir --no-default-features --features nightly; fi
+  - test $TRAVIS_RUST_VERSION != nightly ] || cargo test --no-default-features --features nightly
+  - (cd libs/bragi && cargo test)
+  - (cd libs/mimir && cargo test)
+  - test $TRAVIS_RUST_VERSION != nightly || (cd bragi && cargo test --no-default-features --features nightly)
+  - test $TRAVIS_RUST_VERSION != nightly || (cd mimir && cargo test --no-default-features --features nightly)
 
 services:
   - docker
diff --git a/libs/bragi/Cargo.toml b/libs/bragi/Cargo.toml
@@ -24,8 +24,8 @@ geojson = { version="*", features=["with-serde"] }
 geo = "0.1.1"
 
 [features]
-default = ["serde_codegen"]
-nightly = ["serde_derive"]
+default = ["serde_codegen", "mimir/default"]
+nightly = ["serde_derive", "mimir/nightly"]
 
 [build-dependencies]
 serde_codegen = { version = "0.8", optional = true }