diff options
| author | Oliver Schneider <oli-obk@users.noreply.github.com> | 2017-08-09 21:35:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 21:35:51 +0200 |
| commit | e71af86259fa6d9a7044a9ca61e3249e4e1434f6 (patch) | |
| tree | 3653909f2c09c783a349a431d6284465025be0e2 | |
| parent | 4ce60abd84f0458bb011f38774670acf06a44f4c (diff) | |
| parent | e2de0b270900c5f4b5dea465d3b8a779f9683bc6 (diff) | |
| download | rust-e71af86259fa6d9a7044a9ca61e3249e4e1434f6.tar.gz rust-e71af86259fa6d9a7044a9ca61e3249e4e1434f6.zip | |
Merge branch 'master' into oli-obk-patch-2
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | Cargo.toml | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 46734f6f114..78de5b657ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,9 +15,9 @@ script: xargo/build.sh - | # Test plain miri - cargo build --release && + cargo build --release --features "cargo_miri" && cargo test --release && - cargo install + cargo install --features "cargo_miri" - | # Test cargo miri cd cargo-miri-test && diff --git a/Cargo.toml b/Cargo.toml index d674cc10d3e..5f4a87eca42 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,6 +18,7 @@ doc = false name = "cargo-miri" test = false path = "miri/bin/cargo-miri.rs" +required-features = ["cargo_miri"] [lib] test = false @@ -28,9 +29,12 @@ byteorder = { version = "1.1", features = ["i128"]} env_logger = "0.4.3" log = "0.3.6" log_settings = "0.1.1" -cargo_metadata = "0.2" +cargo_metadata = { version = "0.2", optional = true } rustc_miri = { path = "src/librustc_mir" } +[features] +cargo_miri = ["cargo_metadata"] + [dev-dependencies] compiletest_rs = "0.2.6" |