Improve bootstrap crate testing for emscripten

diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index c839e40535329e9367424394c73427377d3a84ed..0bd9355098f26df9a25680c38d5d7bd1922168b9 100644 (file)
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -385,8 +385,19 @@ fn krate_emscripten(build: &Build,
 
      for test in tests {
          let test_file_name = test.to_string_lossy().into_owned();
-         let output = output(Command::new("node").arg(&test_file_name));
-         println!("{}", output);
+         println!("running {}", test_file_name);
+         let output = Command::new("node")
+             .arg(&test_file_name)
+             .stderr(::std::process::Stdio::inherit())
+             .output();
+         let output = match output {
+             Ok(status) => status,
+             Err(e) => panic!(format!("failed to execute command: {}", e)),
+         };
+         println!("{}", String::from_utf8(output.stdout).unwrap());
+         if !output.status.success() {
+             panic!("some tests failed");
+         }
      }
  }
 
@@ -402,7 +413,7 @@ fn find_tests(dir: &Path,
         let filename = e.file_name().into_string().unwrap();
         if (target.contains("windows") && filename.ends_with(".exe")) ||
            (!target.contains("windows") && !filename.contains(".")) ||
-           (target.contains("asmjs") && filename.contains(".js")){
+           (target.contains("emscripten") && filename.contains(".js")){
             dst.push(e.path());
         }
     }