T0b1/wasmtime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation of integration tests

Browse Source
This commit is contained in:
Jakub Konka
2019-11-08 06:58:05 +01:00
parent 73f85f5c4b
commit ac40eff871
1 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wasi-common/tests/wasm_tests/runtime.rs
View File

@@ -21,7 +21,7 @@ pub fn instantiate(data: &[u8], bin_name: &str, workspace: Option<&Path>) -> any
CompilationStrategy::Auto, CompilationStrategy::Auto,
); );
let engine = HostRef::new(Engine::new(config)); let engine = HostRef::new(Engine::new(config));
let store = HostRef::new(Store::new(engine)); let store = HostRef::new(Store::new(&engine));
let mut module_registry = HashMap::new(); let mut module_registry = HashMap::new();
let global_exports = store.borrow().global_exports().clone(); let global_exports = store.borrow().global_exports().clone();
@@ -56,7 +56,7 @@ pub fn instantiate(data: &[u8], bin_name: &str, workspace: Option<&Path>) -> any
module_registry.insert( module_registry.insert(
"wasi_unstable".to_owned(), "wasi_unstable".to_owned(),
Instance::from_handle( Instance::from_handle(
store.clone(), &store,
wasmtime_wasi::instantiate_wasi_with_context( wasmtime_wasi::instantiate_wasi_with_context(
"", "",
global_exports.clone(), global_exports.clone(),
@@ -67,8 +67,7 @@ pub fn instantiate(data: &[u8], bin_name: &str, workspace: Option<&Path>) -> any
.context("failed to create instance from handle")?, .context("failed to create instance from handle")?,
); );
let module = let module = HostRef::new(Module::new(&store, &data).context("failed to create wasm module")?);
HostRef::new(Module::new(store.clone(), &data).context("failed to create wasm module")?);
let imports = module let imports = module
.borrow() .borrow()
.imports() .imports()
@@ -91,12 +90,10 @@ pub fn instantiate(data: &[u8], bin_name: &str, workspace: Option<&Path>) -> any
} }
}) })
.collect::<Result<Vec<_>, _>>()?; .collect::<Result<Vec<_>, _>>()?;
let _ = HostRef::new( let _ = HostRef::new(Instance::new(&store, &module, &imports).context(format!(
Instance::new(store.clone(), module.clone(), &imports).context(format!( "error while instantiating Wasm module '{}'",
"error while instantiating Wasm module '{}'", bin_name,
bin_name, ))?);
))?,
);
Ok(()) Ok(())
} }