Skip to content

Commit

Permalink
Use compiletest_rs flags supported by stable toolchain, and fixed it'…
Browse files Browse the repository at this point in the history
…s version in place.

Made Travis CI run all tests on almost all platforms, except oldest rustc 1.20 which is incompatible with compiletest_rs.

Now all tests could be run locally without Nightly, and on more platforms in CI.
  • Loading branch information
Mart-Bogdan committed Jan 26, 2019
1 parent cf2d746 commit 87caf02
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .gitignore
@@ -1,2 +1,4 @@
target
Cargo.lock

/.idea/
4 changes: 3 additions & 1 deletion .travis.yml
Expand Up @@ -3,16 +3,18 @@ branches:
- /.*(.tmp)$/

language: rust
env: EXTRA_ARGS="--features unstable"
matrix:
include:
# This version is tested to avoid unintentional bumping of the minimum supported Rust version
- rust: 1.20.0
# This version don't support unstable features
env: EXTRA_ARGS=""
- rust: stable
- rust: stable
os: osx
- rust: beta
- rust: nightly
env: EXTRA_ARGS="--features unstable"

sudo: false
script:
Expand Down
2 changes: 1 addition & 1 deletion test_suite/Cargo.toml
Expand Up @@ -7,7 +7,7 @@ unstable = ["compiletest_rs"]

[dependencies]
bitflags = { path = "../" }
compiletest_rs = { version = "*", optional = true }
compiletest_rs = { version = "0.3.18", optional = true, features=["stable"] }
serde = "1.0"
serde_derive = "1.0"
serde_json = "1.0"

0 comments on commit 87caf02

Please sign in to comment.