b06ed39c1e
* Enhance wiggle to generate its UserErrorConverstion trait with a function that returns a Result<abi_err, String>. This enhancement allows hostcall implementations using wiggle to return an actionable error to the instance (the abi_err) or to terminate the instance using the String as fatal error information. * Enhance wiggle to generate its UserErrorConverstion trait with a function that returns a Result<abi_err, String>. This enhancement allows hostcall implementations using wiggle to return an actionable error to the instance (the abi_err) or to terminate the instance using the String as fatal error information. * Enhance the wiggle/wasmtime integration to leverage new work in ab7e9c6. Hostcall implementations generated by wiggle now return an Result<abi_error, Trap>. As a result, hostcalls experiencing fatal errors may trap, thereby terminating the wasmtime instance. This enhancement has been performed for both wasi snapshot1 and wasi snapshot0. * Update wasi-nn crate to reflect enhancement in issue #2418. * Update wiggle test-helpers for wiggle enhancement made in issue #2418. * Address PR feedback; omit verbose return statement. * Address PR feedback; manually format within a proc macro. * Address PR feedback; manually format proc macro. * Restore return statements to wasi.rs. * Restore return statements in funcs.rs. * Address PR feedback; omit TODO and fix formatting. * Ok-wrap error type in assert statement.
92 lines
2.4 KiB
Rust
92 lines
2.4 KiB
Rust
use proptest::prelude::*;
|
|
use wiggle::GuestMemory;
|
|
use wiggle_test::{impl_errno, HostMemory, MemArea, WasiCtx};
|
|
|
|
wiggle::from_witx!({
|
|
witx: ["$CARGO_MANIFEST_DIR/tests/atoms.witx"],
|
|
ctx: WasiCtx,
|
|
});
|
|
|
|
impl_errno!(types::Errno, types::GuestErrorConversion);
|
|
|
|
impl<'a> atoms::Atoms for WasiCtx<'a> {
|
|
fn int_float_args(&self, an_int: u32, an_float: f32) -> Result<(), types::Errno> {
|
|
println!("INT FLOAT ARGS: {} {}", an_int, an_float);
|
|
Ok(())
|
|
}
|
|
fn double_int_return_float(&self, an_int: u32) -> Result<types::AliasToFloat, types::Errno> {
|
|
Ok((an_int as f32) * 2.0)
|
|
}
|
|
}
|
|
|
|
// There's nothing meaningful to test here - this just demonstrates the test machinery
|
|
|
|
#[derive(Debug)]
|
|
struct IntFloatExercise {
|
|
pub an_int: u32,
|
|
pub an_float: f32,
|
|
}
|
|
|
|
impl IntFloatExercise {
|
|
pub fn test(&self) {
|
|
let ctx = WasiCtx::new();
|
|
let host_memory = HostMemory::new();
|
|
|
|
let e = atoms::int_float_args(&ctx, &host_memory, self.an_int as i32, self.an_float);
|
|
|
|
assert_eq!(e, Ok(types::Errno::Ok.into()), "int_float_args error");
|
|
}
|
|
|
|
pub fn strat() -> BoxedStrategy<Self> {
|
|
(prop::num::u32::ANY, prop::num::f32::ANY)
|
|
.prop_map(|(an_int, an_float)| IntFloatExercise { an_int, an_float })
|
|
.boxed()
|
|
}
|
|
}
|
|
|
|
proptest! {
|
|
#[test]
|
|
fn int_float_exercise(e in IntFloatExercise::strat()) {
|
|
e.test()
|
|
}
|
|
}
|
|
#[derive(Debug)]
|
|
struct DoubleIntExercise {
|
|
pub input: u32,
|
|
pub return_loc: MemArea,
|
|
}
|
|
|
|
impl DoubleIntExercise {
|
|
pub fn test(&self) {
|
|
let ctx = WasiCtx::new();
|
|
let host_memory = HostMemory::new();
|
|
|
|
let e = atoms::double_int_return_float(
|
|
&ctx,
|
|
&host_memory,
|
|
self.input as i32,
|
|
self.return_loc.ptr as i32,
|
|
);
|
|
|
|
let return_val = host_memory
|
|
.ptr::<types::AliasToFloat>(self.return_loc.ptr)
|
|
.read()
|
|
.expect("failed to read return");
|
|
assert_eq!(e, Ok(types::Errno::Ok.into()), "errno");
|
|
assert_eq!(return_val, (self.input as f32) * 2.0, "return val");
|
|
}
|
|
|
|
pub fn strat() -> BoxedStrategy<Self> {
|
|
(prop::num::u32::ANY, HostMemory::mem_area_strat(4))
|
|
.prop_map(|(input, return_loc)| DoubleIntExercise { input, return_loc })
|
|
.boxed()
|
|
}
|
|
}
|
|
|
|
proptest! {
|
|
#[test]
|
|
fn double_int_return_float(e in DoubleIntExercise::strat()) {
|
|
e.test()
|
|
}
|
|
}
|