diff options
| author | Ralf Jung <post@ralfj.de> | 2017-08-09 11:15:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-09 11:15:59 -0700 |
| commit | e2de0b270900c5f4b5dea465d3b8a779f9683bc6 (patch) | |
| tree | a375050e186e6c4ef71b4ab62cfcb37828e0e877 | |
| parent | a6096fbfba1042d1f4ad3b7c7144692d1286f71a (diff) | |
| parent | 7e6c49753910b022f86fd8aa5b43dbfe6181ce6e (diff) | |
| download | rust-e2de0b270900c5f4b5dea465d3b8a779f9683bc6.tar.gz rust-e2de0b270900c5f4b5dea465d3b8a779f9683bc6.zip | |
Merge pull request #294 from oli-obk/cargo_miri
Make cargo_miri a feature
| -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" |