resolve conlicts and pass the test

master
huangjj27 7 years ago
parent 6d3f1c2835
commit 2512199cb3
  1. 1
      src/bindgen.rs
  2. 7
      tests/all/build.rs

@ -9,7 +9,6 @@ use manifest::CrateData;
use progressbar::Step;
use slog::Logger;
use std::fs;
use std::env;
use std::path::{Path, PathBuf};
use std::process::Command;
use target;

@ -237,13 +237,12 @@ fn it_format_out_dir_on_windows() {
"build",
&fixture.path.display().to_string(),
])
let logger = logger::new(&cli.cmd, 1).unwrap();
let _result =
command::run_wasm_pack(cli.cmd, &logger).expect("js_hello_world example should pass");
.unwrap();
fixture.run(cli.cmd).unwrap();
let wasm_pack_log = utils::file::read_file(&fixture.path.join("wasm-pack.log")).unwrap();
assert!(
wasm_pack_log.contains(r"Your wasm pkg is ready to publish at C:\Users\"),
wasm_pack_log.contains(r"Your wasm pkg is ready to publish at c:\Users\"),
"directories in wasm-pack.log should be well formatted",
);
}

Loading…
Cancel
Save