Merge pull request rust-lang#104 from oli-obk/cargo

add cargo-miri subcommand

.gitignore

@@ -1,4 +1,4 @@
-/target
+target
 /doc
 tex/*/out
 *.dot

.travis.yml

@@ -10,8 +10,14 @@ before_script:
 - sh ~/rust-installer/rustup.sh --add-target=i686-pc-windows-msvc --prefix=/home/travis/rust -y --disable-sudo
 script:
 - |
-  env RUST_SYSROOT=$HOME/rust travis-cargo build &&
-  env RUST_SYSROOT=$HOME/rust travis-cargo test
+  export RUST_SYSROOT=$HOME/rust &&
+  travis-cargo build &&
+  travis-cargo test &&
+  travis-cargo install &&
+  cd cargo-miri-test &&
+  cargo miri &&
+  cargo miri test &&
+  cd ..
 notifications:
   email:
     on_success: never

Cargo.toml

@@ -11,6 +11,11 @@ doc = false
 name = "miri"
 test = false
 
+[[bin]]
+doc = false
+name = "cargo-miri"
+test = false
+
 [lib]
 test = false
 
@@ -20,6 +25,7 @@ byteorder = { git = "https://github.com/quininer/byteorder.git", branch = "i128"
 env_logger = "0.3.3"
 log = "0.3.6"
 log_settings = "0.1.1"
+cargo_metadata = "0.1"
 
 [dev-dependencies]
 compiletest_rs = "0.2.5"

cargo-miri-test/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "cargo-miri-test"
+version = "0.1.0"
+authors = ["Oliver Schneider <[email protected]>"]
+
+[dependencies]

cargo-miri-test/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    assert_eq!(5, 5);
+}

cargo-miri-test/tests/foo.rs

@@ -0,0 +1,4 @@
+#[test]
+fn bar() {
+    assert_eq!(4, 4);
+}