Patch wasmtime-wasi to use this wasi-common version

This commit is contained in:
Jakub Konka
2019-06-25 12:19:42 +02:00
committed by Dan Gohman
parent 81b673f908
commit 656112d00b
3 changed files with 5 additions and 1161 deletions

56
tests/runtime.rs Normal file
View File

@@ -0,0 +1,56 @@
use cranelift_codegen::settings;
use wasmtime_jit::Context;
pub fn instantiate<S: AsRef<str>>(
data: &[u8],
bin_name: S,
workspace: Option<S>,
) -> Result<(), String> {
// Prepare runtime
let isa_builder =
cranelift_native::builder().map_err(|_| "host machine is not a supported target")?;
let flag_builder = settings::builder();
let isa = isa_builder.finish(settings::Flags::new(flag_builder));
let mut context = Context::with_isa(isa);
let global_exports = context.get_global_exports();
let get_preopens = |workspace: Option<S>| -> Result<Vec<_>, String> {
if let Some(workspace) = workspace {
let preopen_dir = wasi_common::preopen_dir(workspace.as_ref()).map_err(|e| {
format!(
"error while preopening directory '{}': {}",
workspace.as_ref(),
e
)
})?;
Ok(vec![(".".to_owned(), preopen_dir)])
} else {
Ok(vec![])
}
};
context.name_instance(
"wasi_unstable".to_owned(),
wasmtime_wasi::instantiate_wasi(
"",
global_exports,
&get_preopens(workspace)?,
&[bin_name.as_ref().to_owned(), ".".to_owned()],
&[],
)
.map_err(|e| format!("error instantiating WASI: {}", e))?,
);
// Compile and instantiating a wasm module.
context
.instantiate_module(None, &data)
.map(|_| ())
.map_err(|e| {
format!(
"error while processing main module '{}': {}",
bin_name.as_ref(),
e
)
})
}