* wiggle: no longer need to guard wasmtime integration behind a feature this existed so we could use wiggle in lucet, but lucet is long EOL * replace wiggle::Trap with wiggle::wasmtime_crate::Trap * wiggle tests: unwrap traps because we cant assert_eq on them * wasi-common: emit a wasmtime::Trap instead of a wiggle::Trap formally add a dependency on wasmtime here to make it obvious, though we do now have a transitive one via wiggle no matter what (and therefore can get rid of the default-features=false on the wiggle dep) * wasi-nn: use wasmtime::Trap instead of wiggle::Trap there's no way the implementation of this func is actually a good idea, it will panic the host process on any error, but I'll ask @mtr to fix that * wiggle test-helpers examples: fixes * wasi-common cant cross compile to wasm32-unknown-emscripten anymore this was originally for the WASI polyfill for web targets. Those days are way behind us now. * wasmtime wont compile for armv7-unknown-linux-gnueabihf either
75 lines
1.9 KiB
Rust
75 lines
1.9 KiB
Rust
use proptest::prelude::*;
|
|
use wiggle::{GuestMemory, GuestType};
|
|
use wiggle_test::{impl_errno, HostMemory, MemArea, WasiCtx};
|
|
|
|
const FD_VAL: u32 = 123;
|
|
|
|
wiggle::from_witx!({
|
|
witx: ["$CARGO_MANIFEST_DIR/tests/handles.witx"],
|
|
});
|
|
|
|
impl_errno!(types::Errno);
|
|
|
|
impl<'a> handle_examples::HandleExamples for WasiCtx<'a> {
|
|
fn fd_create(&mut self) -> Result<types::Fd, types::Errno> {
|
|
Ok(types::Fd::from(FD_VAL))
|
|
}
|
|
fn fd_consume(&mut self, fd: types::Fd) -> Result<(), types::Errno> {
|
|
println!("FD_CONSUME {}", fd);
|
|
if fd == types::Fd::from(FD_VAL) {
|
|
Ok(())
|
|
} else {
|
|
Err(types::Errno::InvalidArg)
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
struct HandleExercise {
|
|
pub return_loc: MemArea,
|
|
}
|
|
|
|
impl HandleExercise {
|
|
pub fn test(&self) {
|
|
let mut ctx = WasiCtx::new();
|
|
let host_memory = HostMemory::new();
|
|
|
|
let e =
|
|
handle_examples::fd_create(&mut ctx, &host_memory, self.return_loc.ptr as i32).unwrap();
|
|
|
|
assert_eq!(e, types::Errno::Ok as i32, "fd_create error");
|
|
|
|
let h_got: u32 = host_memory
|
|
.ptr(self.return_loc.ptr)
|
|
.read()
|
|
.expect("return ref_mut");
|
|
|
|
assert_eq!(h_got, 123, "fd_create return val");
|
|
|
|
let e = handle_examples::fd_consume(&mut ctx, &host_memory, h_got as i32).unwrap();
|
|
|
|
assert_eq!(e, types::Errno::Ok as i32, "fd_consume error");
|
|
|
|
let e = handle_examples::fd_consume(&mut ctx, &host_memory, h_got as i32 + 1).unwrap();
|
|
|
|
assert_eq!(
|
|
e,
|
|
types::Errno::InvalidArg as i32,
|
|
"fd_consume invalid error"
|
|
);
|
|
}
|
|
|
|
pub fn strat() -> BoxedStrategy<Self> {
|
|
(HostMemory::mem_area_strat(types::Fd::guest_size()))
|
|
.prop_map(|return_loc| HandleExercise { return_loc })
|
|
.boxed()
|
|
}
|
|
}
|
|
|
|
proptest! {
|
|
#[test]
|
|
fn handle_exercise(e in HandleExercise::strat()) {
|
|
e.test()
|
|
}
|
|
}
|