Merge remote-tracking branch 'upstream/master'

diff --cc tests/testsuite/clean.rs
index 0000000000000000000000000000000000000000,bc701a8e27e0295a9e1072f1717a9dfefce17e4c..12d1b4cb184b9ccd107d774fda8dc4d2efc79bf7
mode 000000,100644..100644
--- /dev/null
--- 2/tests/testsuite/clean.rs
+++ b/tests/testsuite/clean.rs
@@@ -1,0 -1,236 +1,263 @@@
+ use std::env;
+ 
+ use cargotest::support::{git, project, execs, main_file, basic_bin_manifest};
+ use cargotest::support::registry::Package;
+ use hamcrest::{assert_that, existing_dir, existing_file, is_not};
+ 
+ #[test]
+ fn cargo_clean_simple() {
+     let p = project("foo")
+         .file("Cargo.toml", &basic_bin_manifest("foo"))
+         .file("src/foo.rs", &main_file(r#""i am foo""#, &[]))
+         .build();
+ 
+     assert_that(p.cargo("build"), execs().with_status(0));
+     assert_that(&p.build_dir(), existing_dir());
+ 
+     assert_that(p.cargo("clean"),
+                 execs().with_status(0));
+     assert_that(&p.build_dir(), is_not(existing_dir()));
+ }
+ 
+ #[test]
+ fn different_dir() {
+     let p = project("foo")
+         .file("Cargo.toml", &basic_bin_manifest("foo"))
+         .file("src/foo.rs", &main_file(r#""i am foo""#, &[]))
+         .file("src/bar/a.rs", "")
+         .build();
+ 
+     assert_that(p.cargo("build"), execs().with_status(0));
+     assert_that(&p.build_dir(), existing_dir());
+ 
+     assert_that(p.cargo("clean").cwd(&p.root().join("src")),
+                 execs().with_status(0).with_stdout(""));
+     assert_that(&p.build_dir(), is_not(existing_dir()));
+ }
+ 
+ #[test]
+ fn clean_multiple_packages() {
+     let p = project("foo")
+         .file("Cargo.toml", r#"
+             [package]
+             name = "foo"
+             version = "0.0.1"
+             authors = []
+ 
+             [dependencies.d1]
+                 path = "d1"
+             [dependencies.d2]
+                 path = "d2"
+ 
+             [[bin]]
+                 name = "foo"
+         "#)
+         .file("src/foo.rs", &main_file(r#""i am foo""#, &[]))
+         .file("d1/Cargo.toml", r#"
+             [package]
+             name = "d1"
+             version = "0.0.1"
+             authors = []
+ 
+             [[bin]]
+                 name = "d1"
+         "#)
+         .file("d1/src/main.rs", "fn main() { println!(\"d1\"); }")
+         .file("d2/Cargo.toml", r#"
+             [package]
+             name = "d2"
+             version = "0.0.1"
+             authors = []
+ 
+             [[bin]]
+                 name = "d2"
+         "#)
+         .file("d2/src/main.rs", "fn main() { println!(\"d2\"); }")
+         .build();
+ 
+     assert_that(p.cargo("build").arg("-p").arg("d1").arg("-p").arg("d2")
+                                         .arg("-p").arg("foo"),
+                 execs().with_status(0));
+ 
+     let d1_path = &p.build_dir().join("debug")
+                                 .join(format!("d1{}", env::consts::EXE_SUFFIX));
+     let d2_path = &p.build_dir().join("debug")
+                                 .join(format!("d2{}", env::consts::EXE_SUFFIX));
+ 
+ 
+     assert_that(&p.bin("foo"), existing_file());
+     assert_that(d1_path, existing_file());
+     assert_that(d2_path, existing_file());
+ 
+     assert_that(p.cargo("clean").arg("-p").arg("d1").arg("-p").arg("d2")
+                                 .cwd(&p.root().join("src")),
+                 execs().with_status(0).with_stdout(""));
+     assert_that(&p.bin("foo"), existing_file());
+     assert_that(d1_path, is_not(existing_file()));
+     assert_that(d2_path, is_not(existing_file()));
+ }
+ 
+ #[test]
+ fn clean_release() {
+     let p = project("foo")
+         .file("Cargo.toml", r#"
+             [package]
+             name = "foo"
+             version = "0.0.1"
+             authors = []
+ 
+             [dependencies]
+             a = { path = "a" }
+         "#)
+         .file("src/main.rs", "fn main() {}")
+         .file("a/Cargo.toml", r#"
+             [package]
+             name = "a"
+             version = "0.0.1"
+             authors = []
+         "#)
+         .file("a/src/lib.rs", "")
+         .build();
+ 
+     assert_that(p.cargo("build").arg("--release"),
+                 execs().with_status(0));
+ 
+     assert_that(p.cargo("clean").arg("-p").arg("foo"),
+                 execs().with_status(0));
+     assert_that(p.cargo("build").arg("--release"),
+                 execs().with_status(0).with_stdout(""));
+ 
+     assert_that(p.cargo("clean").arg("-p").arg("foo").arg("--release"),
+                 execs().with_status(0));
+     assert_that(p.cargo("build").arg("--release"),
+                 execs().with_status(0).with_stderr("\
+ [COMPILING] foo v0.0.1 ([..])
+ [FINISHED] release [optimized] target(s) in [..]
+ "));
+ }
+ 
+ #[test]
+ fn build_script() {
+     let p = project("foo")
+         .file("Cargo.toml", r#"
+             [package]
+             name = "foo"
+             version = "0.0.1"
+             authors = []
+             build = "build.rs"
+         "#)
+         .file("src/main.rs", "fn main() {}")
+         .file("build.rs", r#"
+             use std::path::PathBuf;
+             use std::env;
+ 
+             fn main() {
+                 let out = PathBuf::from(env::var_os("OUT_DIR").unwrap());
+                 if env::var("FIRST").is_ok() {
+                     std::fs::File::create(out.join("out")).unwrap();
+                 } else {
+                     assert!(!std::fs::metadata(out.join("out")).is_ok());
+                 }
+             }
+         "#)
+         .file("a/src/lib.rs", "")
+         .build();
+ 
+     assert_that(p.cargo("build").env("FIRST", "1"),
+                 execs().with_status(0));
+     assert_that(p.cargo("clean").arg("-p").arg("foo"),
+                 execs().with_status(0));
+     assert_that(p.cargo("build").arg("-v"),
+                 execs().with_status(0).with_stderr("\
+ [COMPILING] foo v0.0.1 ([..])
+ [RUNNING] `rustc [..] build.rs [..]`
+ [RUNNING] `[..]build-script-build`
+ [RUNNING] `rustc [..] src[/]main.rs [..]`
+ [FINISHED] dev [unoptimized + debuginfo] target(s) in [..]
+ "));
+ }
+ 
+ #[test]
+ fn clean_git() {
+     let git = git::new("dep", |project| {
+         project.file("Cargo.toml", r#"
+             [project]
+             name = "dep"
+             version = "0.5.0"
+             authors = []
+         "#)
+         .file("src/lib.rs", "")
+     }).unwrap();
+ 
+     let p = project("foo")
+         .file("Cargo.toml", &format!(r#"
+             [package]
+             name = "foo"
+             version = "0.0.1"
+             authors = []
+ 
+             [dependencies]
+             dep = {{ git = '{}' }}
+         "#, git.url()))
+         .file("src/main.rs", "fn main() {}")
+         .build();
+ 
+     assert_that(p.cargo("build"),
+                 execs().with_status(0));
+     assert_that(p.cargo("clean").arg("-p").arg("dep"),
+                 execs().with_status(0).with_stdout(""));
+     assert_that(p.cargo("build"),
+                 execs().with_status(0));
+ }
+ 
+ #[test]
+ fn registry() {
+     let p = project("foo")
+         .file("Cargo.toml", r#"
+             [package]
+             name = "foo"
+             version = "0.0.1"
+             authors = []
+ 
+             [dependencies]
+             bar = "0.1"
+         "#)
+         .file("src/main.rs", "fn main() {}")
+         .build();
+ 
+     Package::new("bar", "0.1.0").publish();
+ 
+     assert_that(p.cargo("build"),
+                 execs().with_status(0));
+     assert_that(p.cargo("clean").arg("-p").arg("bar"),
+                 execs().with_status(0).with_stdout(""));
+     assert_that(p.cargo("build"),
+                 execs().with_status(0));
+ }
++
++#[test]
++fn clean_verbose(){
++    let p = project("foo")
++    .file("Cargo.toml", r#"
++        [package]
++        name = "foo"
++        version = "0.0.1"
++
++        [dependencies]
++        bar = "0.1"
++    "#)
++    .file("src/main.rs", "fn main() {}")
++    .build();
++
++    Package::new("bar", "0.1.0").publish();
++
++    assert_that(p.cargo("build"),
++                execs().with_status(0));
++    assert_that(p.cargo("clean").arg("-p").arg("bar").arg("--verbose"),
++                execs().with_status(0).with_stderr("\
++[REMOVING] [..]
++[REMOVING] [..]
++"));
++    assert_that(p.cargo("build"),
++            execs().with_status(0));
++}