Upgrade to Rust 2018

[cargo.git] / tests / testsuite / plugins.rs

diff --git a/tests/testsuite/plugins.rs b/tests/testsuite/plugins.rs
index 318a295245e9c7fe4a8b58c201562008160dc820..8d93961b59b7a319a8555668f7650d73a1babef3 100644 (file)
--- a/tests/testsuite/plugins.rs
+++ b/tests/testsuite/plugins.rs
@@ -1,9 +1,5 @@
-use std::fs;
-use std::env;
-
-use cargotest::{is_nightly, rustc_host};
-use cargotest::support::{execs, project};
-use hamcrest::assert_that;
+use crate::support::{basic_manifest, project};
+use crate::support::{is_nightly, rustc_host};
 
 #[test]
 fn plugin_to_the_max() {
@@ -11,7 +7,7 @@ fn plugin_to_the_max() {
         return;
     }
 
-    let foo = project("foo")
+    let foo = project()
         .file(
             "Cargo.toml",
             r#"
@@ -26,8 +22,7 @@ fn plugin_to_the_max() {
             [dependencies.bar]
             path = "../bar"
         "#,
-        )
-        .file(
+        ).file(
             "src/main.rs",
             r#"
             #![feature(plugin)]
@@ -36,8 +31,7 @@ fn plugin_to_the_max() {
 
             fn main() { foo_lib::foo(); }
         "#,
-        )
-        .file(
+        ).file(
             "src/foo_lib.rs",
             r#"
             #![feature(plugin)]
@@ -45,9 +39,9 @@ fn plugin_to_the_max() {
 
             pub fn foo() {}
         "#,
-        )
-        .build();
-    let _bar = project("bar")
+        ).build();
+    let _bar = project()
+        .at("bar")
         .file(
             "Cargo.toml",
             r#"
@@ -63,8 +57,7 @@ fn plugin_to_the_max() {
             [dependencies.baz]
             path = "../baz"
         "#,
-        )
-        .file(
+        ).file(
             "src/lib.rs",
             r#"
             #![feature(plugin_registrar, rustc_private)]
@@ -79,9 +72,9 @@ fn plugin_to_the_max() {
                 println!("{}", baz::baz());
             }
         "#,
-        )
-        .build();
-    let _baz = project("baz")
+        ).build();
+    let _baz = project()
+        .at("baz")
         .file(
             "Cargo.toml",
             r#"
@@ -94,12 +87,11 @@ fn plugin_to_the_max() {
             name = "baz"
             crate_type = ["dylib"]
         "#,
-        )
-        .file("src/lib.rs", "pub fn baz() -> i32 { 1 }")
+        ).file("src/lib.rs", "pub fn baz() -> i32 { 1 }")
         .build();
 
-    assert_that(foo.cargo("build"), execs().with_status(0));
-    assert_that(foo.cargo("doc"), execs().with_status(0));
+    foo.cargo("build").run();
+    foo.cargo("doc").run();
 }
 
 #[test]
@@ -108,17 +100,8 @@ fn plugin_with_dynamic_native_dependency() {
         return;
     }
 
-    let workspace = project("ws")
-        .file(
-            "Cargo.toml",
-            r#"
-            [workspace]
-            members = ["builder", "foo"]
-        "#,
-        )
-        .build();
-
-    let build = project("ws/builder")
+    let build = project()
+        .at("builder")
         .file(
             "Cargo.toml",
             r#"
@@ -131,17 +114,10 @@ fn plugin_with_dynamic_native_dependency() {
             name = "builder"
             crate-type = ["dylib"]
         "#,
-        )
-        .file(
-            "src/lib.rs",
-            r#"
-            #[no_mangle]
-            pub extern fn foo() {}
-        "#,
-        )
+        ).file("src/lib.rs", "#[no_mangle] pub extern fn foo() {}")
         .build();
 
-    let foo = project("ws/foo")
+    let foo = project()
         .file(
             "Cargo.toml",
             r#"
@@ -153,8 +129,7 @@ fn plugin_with_dynamic_native_dependency() {
             [dependencies.bar]
             path = "bar"
         "#,
-        )
-        .file(
+        ).file(
             "src/main.rs",
             r#"
             #![feature(plugin)]
@@ -162,8 +137,7 @@ fn plugin_with_dynamic_native_dependency() {
 
             fn main() {}
         "#,
-        )
-        .file(
+        ).file(
             "bar/Cargo.toml",
             r#"
             [package]
@@ -176,20 +150,30 @@ fn plugin_with_dynamic_native_dependency() {
             name = "bar"
             plugin = true
         "#,
-        )
-        .file(
+        ).file(
             "bar/build.rs",
             r#"
-            use std::path::PathBuf;
             use std::env;
+            use std::fs;
+            use std::path::PathBuf;
 
             fn main() {
-                let src = PathBuf::from(env::var("SRC").unwrap());
-                println!("cargo:rustc-flags=-L {}/deps", src.parent().unwrap().display());
+                let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
+                let root = PathBuf::from(env::var("BUILDER_ROOT").unwrap());
+                let file = format!("{}builder{}",
+                    env::consts::DLL_PREFIX,
+                    env::consts::DLL_SUFFIX);
+                let src = root.join(&file);
+                let dst = out_dir.join(&file);
+                fs::copy(src, dst).unwrap();
+                if cfg!(windows) {
+                    fs::copy(root.join("builder.dll.lib"),
+                             out_dir.join("builder.dll.lib")).unwrap();
+                }
+                println!("cargo:rustc-flags=-L {}", out_dir.display());
             }
         "#,
-        )
-        .file(
+        ).file(
             "bar/src/lib.rs",
             r#"
             #![feature(plugin_registrar, rustc_private)]
@@ -206,30 +190,17 @@ fn plugin_with_dynamic_native_dependency() {
                 unsafe { foo() }
             }
         "#,
-        )
-        .build();
+        ).build();
+
+    build.cargo("build").run();
 
-    assert_that(build.cargo("build"), execs().with_status(0));
-
-    let src = workspace.root().join("target/debug");
-    let lib = fs::read_dir(&src)
-        .unwrap()
-        .map(|s| s.unwrap().path())
-        .find(|lib| {
-            let lib = lib.file_name().unwrap().to_str().unwrap();
-            lib.starts_with(env::consts::DLL_PREFIX) && lib.ends_with(env::consts::DLL_SUFFIX)
-        })
-        .unwrap();
-
-    assert_that(
-        foo.cargo("build").env("SRC", &lib).arg("-v"),
-        execs().with_status(0),
-    );
+    let root = build.root().join("target").join("debug");
+    foo.cargo("build -v").env("BUILDER_ROOT", root).run();
 }
 
 #[test]
 fn plugin_integration() {
-    let p = project("foo")
+    let p = project()
         .file(
             "Cargo.toml",
             r#"
@@ -244,18 +215,17 @@ fn plugin_integration() {
             plugin = true
             doctest = false
         "#,
-        )
-        .file("build.rs", "fn main() {}")
+        ).file("build.rs", "fn main() {}")
         .file("src/lib.rs", "")
         .file("tests/it_works.rs", "")
         .build();
 
-    assert_that(p.cargo("test").arg("-v"), execs().with_status(0));
+    p.cargo("test -v").run();
 }
 
 #[test]
 fn doctest_a_plugin() {
-    let p = project("foo")
+    let p = project()
         .file(
             "Cargo.toml",
             r#"
@@ -267,14 +237,7 @@ fn doctest_a_plugin() {
             [dependencies]
             bar = { path = "bar" }
         "#,
-        )
-        .file(
-            "src/lib.rs",
-            r#"
-            #[macro_use]
-            extern crate bar;
-        "#,
-        )
+        ).file("src/lib.rs", "#[macro_use] extern crate bar;")
         .file(
             "bar/Cargo.toml",
             r#"
@@ -287,16 +250,10 @@ fn doctest_a_plugin() {
             name = "bar"
             plugin = true
         "#,
-        )
-        .file(
-            "bar/src/lib.rs",
-            r#"
-            pub fn bar() {}
-        "#,
-        )
+        ).file("bar/src/lib.rs", "pub fn bar() {}")
         .build();
 
-    assert_that(p.cargo("test").arg("-v"), execs().with_status(0));
+    p.cargo("test -v").run();
 }
 
 // See #1515
@@ -304,7 +261,7 @@ fn doctest_a_plugin() {
 fn native_plugin_dependency_with_custom_ar_linker() {
     let target = rustc_host();
 
-    let _foo = project("foo")
+    let _foo = project()
         .file(
             "Cargo.toml",
             r#"
@@ -316,11 +273,11 @@ fn native_plugin_dependency_with_custom_ar_linker() {
             [lib]
             plugin = true
         "#,
-        )
-        .file("src/lib.rs", "")
+        ).file("src/lib.rs", "")
         .build();
 
-    let bar = project("bar")
+    let bar = project()
+        .at("bar")
         .file(
             "Cargo.toml",
             r#"
@@ -332,8 +289,7 @@ fn native_plugin_dependency_with_custom_ar_linker() {
             [dependencies.foo]
             path = "../foo"
         "#,
-        )
-        .file("src/lib.rs", "")
+        ).file("src/lib.rs", "")
         .file(
             ".cargo/config",
             &format!(
@@ -344,19 +300,17 @@ fn native_plugin_dependency_with_custom_ar_linker() {
         "#,
                 target
             ),
-        )
-        .build();
+        ).build();
 
-    assert_that(
-        bar.cargo("build").arg("--verbose"),
-        execs().with_stderr_contains(
+    bar.cargo("build --verbose")
+        .with_status(101)
+        .with_stderr_contains(
             "\
 [COMPILING] foo v0.0.1 ([..])
 [RUNNING] `rustc [..] -C ar=nonexistent-ar -C linker=nonexistent-linker [..]`
 [ERROR] [..]linker[..]
 ",
-        ),
-    );
+        ).run();
 }
 
 #[test]
@@ -365,12 +319,12 @@ fn panic_abort_plugins() {
         return;
     }
 
-    let p = project("bar")
+    let p = project()
         .file(
             "Cargo.toml",
             r#"
             [package]
-            name = "bar"
+            name = "foo"
             version = "0.0.1"
             authors = []
 
@@ -378,32 +332,29 @@ fn panic_abort_plugins() {
             panic = 'abort'
 
             [dependencies]
-            foo = { path = "foo" }
+            bar = { path = "bar" }
         "#,
-        )
-        .file("src/lib.rs", "")
+        ).file("src/lib.rs", "")
         .file(
-            "foo/Cargo.toml",
+            "bar/Cargo.toml",
             r#"
             [package]
-            name = "foo"
+            name = "bar"
             version = "0.0.1"
             authors = []
 
             [lib]
             plugin = true
         "#,
-        )
-        .file(
-            "foo/src/lib.rs",
+        ).file(
+            "bar/src/lib.rs",
             r#"
             #![feature(rustc_private)]
             extern crate syntax;
         "#,
-        )
-        .build();
+        ).build();
 
-    assert_that(p.cargo("build"), execs().with_status(0));
+    p.cargo("build").run();
 }
 
 #[test]
@@ -412,12 +363,12 @@ fn shared_panic_abort_plugins() {
         return;
     }
 
-    let p = project("top")
+    let p = project()
         .file(
             "Cargo.toml",
             r#"
             [package]
-            name = "top"
+            name = "foo"
             version = "0.0.1"
             authors = []
 
@@ -425,21 +376,15 @@ fn shared_panic_abort_plugins() {
             panic = 'abort'
 
             [dependencies]
-            foo = { path = "foo" }
             bar = { path = "bar" }
+            baz = { path = "baz" }
         "#,
-        )
+        ).file("src/lib.rs", "extern crate baz;")
         .file(
-            "src/lib.rs",
-            "
-            extern crate bar;
-        ",
-        )
-        .file(
-            "foo/Cargo.toml",
+            "bar/Cargo.toml",
             r#"
             [package]
-            name = "foo"
+            name = "bar"
             version = "0.0.1"
             authors = []
 
@@ -447,28 +392,18 @@ fn shared_panic_abort_plugins() {
             plugin = true
 
             [dependencies]
-            bar = { path = "../bar" }
+            baz = { path = "../baz" }
         "#,
-        )
-        .file(
-            "foo/src/lib.rs",
+        ).file(
+            "bar/src/lib.rs",
             r#"
             #![feature(rustc_private)]
             extern crate syntax;
-            extern crate bar;
-        "#,
-        )
-        .file(
-            "bar/Cargo.toml",
-            r#"
-            [package]
-            name = "bar"
-            version = "0.0.1"
-            authors = []
+            extern crate baz;
         "#,
-        )
-        .file("bar/src/lib.rs", "")
+        ).file("baz/Cargo.toml", &basic_manifest("baz", "0.0.1"))
+        .file("baz/src/lib.rs", "")
         .build();
 
-    assert_that(p.cargo("build"), execs().with_status(0));
+    p.cargo("build").run();
 }