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

fixes

Browse Source
This commit is contained in:
Pat Hickey
2020-02-21 13:55:49 -08:00
parent 8a110e4b13
commit 2feab2ee2b
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/main.rs
View File

@@ -1,8 +1,7 @@
use proptest::prelude::*; use proptest::prelude::*;
use std::convert::TryFrom; use std::convert::TryFrom;
use wiggle_runtime::{ use wiggle_runtime::{
GuestArray, GuestError, GuestErrorType, GuestPtr, GuestPtrMut, GuestRef, GuestRefMut, GuestArray, GuestError, GuestPtr, GuestPtrMut, GuestRef, GuestRefMut, GuestString,
GuestString,
}; };
use wiggle_test::{HostMemory, MemArea}; use wiggle_test::{HostMemory, MemArea};
@@ -803,7 +802,11 @@ impl HelloStringExercise {
}, },
) )
.prop_filter("non-overlapping pointers", |e| { .prop_filter("non-overlapping pointers", |e| {
non_overlapping_set(&[&e.string_ptr_loc, &e.string_len_loc, &e.return_ptr_loc]) MemArea::non_overlapping_set(&[
&e.string_ptr_loc,
&e.string_len_loc,
&e.return_ptr_loc,
])
}) })
.boxed() .boxed()
} }
@@ -811,7 +814,7 @@ impl HelloStringExercise {
pub fn test(&self) { pub fn test(&self) {
let mut ctx = WasiCtx::new(); let mut ctx = WasiCtx::new();
let mut host_memory = HostMemory::new(); let mut host_memory = HostMemory::new();
let mut guest_memory = GuestMemory::new(host_memory.as_mut_ptr(), host_memory.len() as u32); let mut guest_memory = host_memory.guest_memory();
// Populate string length // Populate string length
*guest_memory *guest_memory
@@ -880,7 +883,7 @@ impl CookieCutterExercise {
pub fn test(&self) { pub fn test(&self) {
let mut ctx = WasiCtx::new(); let mut ctx = WasiCtx::new();
let mut host_memory = HostMemory::new(); let mut host_memory = HostMemory::new();
let mut guest_memory = GuestMemory::new(host_memory.as_mut_ptr(), host_memory.len() as u32); let mut guest_memory = host_memory.guest_memory();
let res = foo::cookie_cutter( let res = foo::cookie_cutter(
&mut ctx, &mut ctx,

7
tests/trivial.rs
View File

@@ -1,9 +1,6 @@
use proptest::prelude::*; use proptest::prelude::*;
use std::convert::TryFrom; use wiggle_runtime::GuestError;
use wiggle_runtime::{ use wiggle_test::HostMemory;
GuestArray, GuestError, GuestErrorType, GuestPtr, GuestPtrMut, GuestRef, GuestRefMut,
};
use wiggle_test::{HostMemory, MemArea};
mod ctx; mod ctx;
use ctx::WasiCtx; use ctx::WasiCtx;