fluencelabs/wasmer
1
0
Fork 0
mirror of https://github.com/fluencelabs/wasmer synced 2025-06-15 18:01:22 +00:00
Code Issues Projects Releases Wiki Activity

Fix emscripten test usage and fix error conditional

Browse Source
This commit is contained in:
Brandon Fish
2019-08-16 09:57:36 -06:00
parent d1c9ab3539
commit 57e621d307
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/emscripten-tests/tests/emtests/_common.rs
View File

@ -42,7 +42,7 @@ macro_rules! assert_emscripten_output {
// let module = compile(&wasm_bytes[..]) // let module = compile(&wasm_bytes[..])
// .map_err(|err| format!("Can't create the WebAssembly module: {}", err)).unwrap(); // NOTE: Need to figure what the unwrap is for ?? // .map_err(|err| format!("Can't create the WebAssembly module: {}", err)).unwrap(); // NOTE: Need to figure what the unwrap is for ??
let mut emscripten_globals = EmscriptenGlobals::new(&module); let mut emscripten_globals = EmscriptenGlobals::new(&module).expect("globals are valid");
let import_object = generate_emscripten_env(&mut emscripten_globals); let import_object = generate_emscripten_env(&mut emscripten_globals);
let mut instance = module.instantiate(&import_object) let mut instance = module.instantiate(&import_object)

2
lib/emscripten/src/utils.rs
View File

@ -42,7 +42,7 @@ pub fn get_emscripten_table_size(module: &Module) -> Result<(u32, Option<u32>),
} }
pub fn get_emscripten_memory_size(module: &Module) -> Result<(Pages, Option<Pages>, bool), String> { pub fn get_emscripten_memory_size(module: &Module) -> Result<(Pages, Option<Pages>, bool), String> {
if module.info().imported_tables.len() == 0 { if module.info().imported_memories.len() == 0 {
return Err("Emscripten requires at least one imported memory".to_string()); return Err("Emscripten requires at least one imported memory".to_string());
} }
let (_, memory) = &module.info().imported_memories[ImportedMemoryIndex::new(0)]; let (_, memory) = &module.info().imported_memories[ImportedMemoryIndex::new(0)];