Merge pull request #442 from alexcrichton/cdylib

Don't require cdylib crate-type for testing

Author: fitzgen

src/command/test.rs

@@ -188,7 +188,6 @@ impl Test {
         match self.mode {
             BuildMode::Normal => steps![
                 step_check_rustc_version,
-                step_check_crate_config,
                 step_add_wasm_target,
                 step_build_tests,
                 step_install_wasm_bindgen,
@@ -213,7 +212,6 @@ impl Test {
                 step_test_safari if self.safari,
             ],
             BuildMode::Noinstall => steps![
-                step_check_crate_config,
                 step_build_tests,
                 step_install_wasm_bindgen,
                 step_test_node if self.node,
@@ -234,13 +232,6 @@ impl Test {
         Ok(())
     }
 
-    fn step_check_crate_config(&mut self, step: &Step, log: &Logger) -> Result<(), Error> {
-        info!(log, "Checking crate configuration...");
-        self.crate_data.check_crate_config(step)?;
-        info!(log, "Crate is correctly configured.");
-        Ok(())
-    }
-
     fn step_add_wasm_target(&mut self, step: &Step, log: &Logger) -> Result<(), Error> {
         info!(&log, "Adding wasm-target...");
         build::rustup_add_wasm_target(log, step)?;

tests/all/test.rs

@@ -286,3 +286,51 @@ fn renamed_crate_name_works() {
     });
     fixture.run(cmd).unwrap();
 }
+
+#[test]
+fn cdylib_not_required() {
+    let fixture = fixture::Fixture::new();
+    fixture
+        .readme()
+        .file(
+            "Cargo.toml",
+            r#"
+                [package]
+                name = "foo"
+                version = "0.1.0"
+                authors = []
+
+                [dependencies]
+                wasm-bindgen = "=0.2.21"
+
+                [dev-dependencies]
+                wasm-bindgen-test = "=0.2.21"
+            "#,
+        )
+        .file(
+            "src/lib.rs",
+            r#"
+                pub fn foo() -> u32 { 1 }
+            "#,
+        )
+        .file(
+            "tests/foo.rs",
+            r#"
+                extern crate wasm_bindgen_test;
+                use wasm_bindgen_test::*;
+
+                #[wasm_bindgen_test]
+                fn smoke() {
+                    foo::foo();
+                }
+            "#,
+        );
+    fixture.install_local_wasm_bindgen();
+    let cmd = Command::Test(test::TestOptions {
+        path: Some(fixture.path.clone()),
+        node: true,
+        mode: build::BuildMode::Noinstall,
+        ..Default::default()
+    });
+    fixture.run(cmd).unwrap();
+}