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

fix test harness stdio

Browse Source
This commit is contained in:
Pat Hickey
2021-05-06 16:19:33 -07:00
parent add115ba00
commit b19d86268c
2 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
crates/test-programs/tests/wasm_tests/runtime/cap_std_sync.rs
View File

@@ -15,7 +15,12 @@ pub fn instantiate_inherit_stdio(
run(data, bin_name, workspace, true) run(data, bin_name, workspace, true)
} }
fn run(data: &[u8], bin_name: &str, workspace: Option<&Path>, stdio: bool) -> anyhow::Result<()> { fn run(
data: &[u8],
bin_name: &str,
workspace: Option<&Path>,
inherit_stdio: bool,
) -> anyhow::Result<()> {
let stdout = WritePipe::new_in_memory(); let stdout = WritePipe::new_in_memory();
let stderr = WritePipe::new_in_memory(); let stderr = WritePipe::new_in_memory();
@@ -26,15 +31,15 @@ fn run(data: &[u8], bin_name: &str, workspace: Option<&Path>, stdio: bool) -> an
// Additionally register any preopened directories if we have them. // Additionally register any preopened directories if we have them.
let mut builder = WasiCtxBuilder::new(); let mut builder = WasiCtxBuilder::new();
if stdio { if inherit_stdio {
builder = builder.inherit_stdio(); builder = builder.inherit_stdio();
} else {
builder = builder
.stdout(Box::new(stdout.clone()))
.stderr(Box::new(stderr.clone()));
} }
builder = builder builder = builder.arg(bin_name)?.arg(".")?;
.arg(bin_name)?
.arg(".")?
.stdout(Box::new(stdout.clone()))
.stderr(Box::new(stderr.clone()));
if let Some(workspace) = workspace { if let Some(workspace) = workspace {
println!("preopen: {:?}", workspace); println!("preopen: {:?}", workspace);

19
crates/test-programs/tests/wasm_tests/runtime/tokio.rs
View File

@@ -15,7 +15,12 @@ pub fn instantiate_inherit_stdio(
run(data, bin_name, workspace, true) run(data, bin_name, workspace, true)
} }
fn run(data: &[u8], bin_name: &str, workspace: Option<&Path>, stdio: bool) -> anyhow::Result<()> { fn run(
data: &[u8],
bin_name: &str,
workspace: Option<&Path>,
inherit_stdio: bool,
) -> anyhow::Result<()> {
let stdout = WritePipe::new_in_memory(); let stdout = WritePipe::new_in_memory();
let stdout_ = stdout.clone(); let stdout_ = stdout.clone();
let stderr = WritePipe::new_in_memory(); let stderr = WritePipe::new_in_memory();
@@ -33,15 +38,15 @@ fn run(data: &[u8], bin_name: &str, workspace: Option<&Path>, stdio: bool) -> an
// Create our wasi context. // Create our wasi context.
let mut builder = WasiCtxBuilder::new(); let mut builder = WasiCtxBuilder::new();
if stdio { if inherit_stdio {
builder = builder.inherit_stdio(); builder = builder.inherit_stdio();
} else {
builder = builder
.stdout(Box::new(stdout_.clone()))
.stderr(Box::new(stderr_.clone()));
} }
builder = builder builder = builder.arg(bin_name)?.arg(".")?;
.arg(bin_name)?
.arg(".")?
.stdout(Box::new(stdout_))
.stderr(Box::new(stderr_));
if let Some(workspace) = workspace { if let Some(workspace) = workspace {
println!("preopen: {:?}", workspace); println!("preopen: {:?}", workspace);