fluencelabs/wasm-utils
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasm-utils synced 2025-06-06 11:21:23 +00:00
Code Issues Projects Releases Wiki Activity

fix wasm-build and add test

Browse Source
This commit is contained in:
NikVolf 2017-11-03 13:52:51 +03:00
parent 71a88147a2
commit b1c1c4afdb
2 changed files with 44 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
build/Cargo.toml
View File

@ -9,5 +9,8 @@ wasm-utils = { path = "../" }
clap = "2.24" clap = "2.24"
parity-wasm = "0.15" parity-wasm = "0.15"
[dev-dependencies]
tempdir = "*"
[[bin]] [[bin]]
name = "wasm-build" name = "wasm-build"

63
build/src/main.rs
View File

@ -35,29 +35,15 @@ pub fn wasm_path(target_dir: &str, bin_name: &str) -> String {
} }
pub fn process_output(target_dir: &str, bin_name: &str) -> Result<(), Error> { pub fn process_output(target_dir: &str, bin_name: &str) -> Result<(), Error> {
let mut path = PathBuf::from(target_dir); let mut cargo_path = PathBuf::from(target_dir);
let wasm_name = bin_name.to_string().replace("-", "_"); let wasm_name = bin_name.to_string().replace("-", "_");
path.push("wasm32-unknown-emscripten"); cargo_path.push("wasm32-unknown-emscripten");
path.push("release"); cargo_path.push("release");
path.push("deps"); cargo_path.push(format!("{}.wasm", wasm_name));
path.push(format!("{}-*.wasm", wasm_name));
let mut files = glob::glob(path.to_string_lossy().as_ref()).expect("glob err") let mut target_path = PathBuf::from(target_dir);
.collect::<Vec<Result<PathBuf, glob::GlobError>>>(); target_path.push(format!("{}.wasm", bin_name));
fs::copy(cargo_path, target_path)?;
if files.len() == 0 {
return Err(Error::NoSuitableFile(path.to_string_lossy().to_string()));
} else if files.len() > 1 {
return Err(Error::TooManyFiles(
files.into_iter().map(|f| f.expect("glob err").to_string_lossy().to_string())
.fold(String::new(), |mut a, b| { a.push_str(", "); a.push_str(&b); a })
))
} else {
let file = files.drain(..).nth(0).expect("0th element exists").expect("glob err");
let mut path = PathBuf::from(target_dir);
path.push(format!("{}.wasm", bin_name));
fs::copy(file, path)?;
}
Ok(()) Ok(())
} }
@ -73,7 +59,7 @@ fn has_ctor(module: &elements::Module) -> bool {
fn main() { fn main() {
wasm_utils::init_log(); wasm_utils::init_log();
let matches = App::new("wasm-opt") let matches = App::new("wasm-build")
.arg(Arg::with_name("target") .arg(Arg::with_name("target")
.index(1) .index(1)
.required(true) .required(true)
@ -147,3 +133,36 @@ fn main() {
} }
} }
#[cfg(test)]
mod tests {
extern crate tempdir;
use self::tempdir::TempDir;
use std::fs;
use super::process_output;
#[test]
fn processes_cargo_output() {
let tmp_dir = TempDir::new("target").expect("temp dir failed");
let target_path = tmp_dir.path().join("wasm32-unknown-emscripten").join("release");
fs::create_dir_all(target_path.clone()).expect("create dir failed");
{
use std::io::Write;
let wasm_path = target_path.join("example_wasm.wasm");
let mut f = fs::File::create(wasm_path).expect("create fail failed");
f.write(b"\0asm").expect("write file failed");
}
process_output(&tmp_dir.path().to_string_lossy(), "example-wasm").expect("process output failed");
assert!(
fs::metadata(tmp_dir.path().join("example-wasm.wasm")).expect("metadata failed").is_file()
)
}
}