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

remove virtfs - it is not suitable for use

Browse Source
This commit is contained in:
Pat Hickey
2021-02-03 15:04:02 -08:00
parent 7a35763d62
commit 31145060b2
8 changed files with 0 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/test-programs/Cargo.toml
View File

@@ -12,7 +12,6 @@ cfg-if = "1.0"
[dev-dependencies]
wasi-common = { path = "../wasi-common", version = "0.22.0" }
wasi-virtfs = { path = "../wasi-common/virtfs", version = "0.22.0" }
wasi-cap-std-sync = { path = "../wasi-common/cap-std-sync", version = "0.22.0" }
wasmtime = { path = "../wasmtime", version = "0.22.0" }
wasmtime-wasi = { path = "../wasi", version = "0.22.0" }

1
crates/test-programs/build.rs
View File

@@ -41,7 +41,6 @@ mod wasi_tests {
build_tests("wasi-tests", &out_dir).expect("building tests");
test_directory(&mut out, "wasi-cap-std-sync", "cap_std_sync", &out_dir)
.expect("generating tests");
test_directory(&mut out, "wasi-virtfs", "virtfs", &out_dir).expect("generating tests");
}
fn build_tests(testsuite: &str, out_dir: &Path) -> io::Result<()> {

1
crates/test-programs/tests/wasm_tests/runtime/mod.rs
View File

@@ -1,2 +1 @@
pub mod cap_std_sync;
pub mod virtfs;

71
crates/test-programs/tests/wasm_tests/runtime/virtfs.rs
View File

@@ -1,71 +0,0 @@
use anyhow::Context;
use std::cell::RefCell;
use std::path::Path;
use std::rc::Rc;
use wasi_common::{
pipe::{ReadPipe, WritePipe},
table::Table,
WasiCtx,
};
use wasmtime::{Linker, Module, Store};
pub fn instantiate(data: &[u8], bin_name: &str, workspace: Option<&Path>) -> anyhow::Result<()> {
let stdout = WritePipe::new_in_memory();
let stderr = WritePipe::new_in_memory();
let r = {
let store = Store::default();
// Create our wasi context.
let mut builder = WasiCtx::builder(
wasi_cap_std_sync::random_ctx(),
wasi_cap_std_sync::clocks_ctx(),
wasi_cap_std_sync::sched_ctx(), // We shouldnt actually use this, but we will until we make a virtual scheduler
Rc::new(RefCell::new(Table::new())),
);
builder = builder
.arg(bin_name)?
.arg(".")?
.stdin(Box::new(ReadPipe::from(Vec::new())))
.stdout(Box::new(stdout.clone()))
.stderr(Box::new(stderr.clone()));
if workspace.is_some() {
let fs = wasi_virtfs::Filesystem::new(wasi_cap_std_sync::clocks_ctx().system, 420); // XXX this is duplicated - should be reference counted so I can use the same in the builder...
builder = builder.preopened_dir(fs.root(), ".")?;
}
let wasi = wasmtime_wasi::Wasi::new(&store, builder.build()?);
let mut linker = Linker::new(&store);
wasi.add_to_linker(&mut linker)?;
let module = Module::new(store.engine(), &data).context("failed to create wasm module")?;
let instance = linker.instantiate(&module)?;
let start = instance.get_func("_start").unwrap();
let with_type = start.get0::<()>()?;
with_type().map_err(anyhow::Error::from)
};
match r {
Ok(()) => Ok(()),
Err(trap) => {
let stdout = stdout
.try_into_inner()
.expect("sole ref to stdout")
.into_inner();
if !stdout.is_empty() {
println!("guest stdout:\n{}\n===", String::from_utf8_lossy(&stdout));
}
let stderr = stderr
.try_into_inner()
.expect("sole ref to stderr")
.into_inner();
if !stderr.is_empty() {
println!("guest stderr:\n{}\n===", String::from_utf8_lossy(&stderr));
}
Err(trap.context(format!("error while testing Wasm module '{}'", bin_name,)))
}
}
}