mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 13:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split CLI arguments with whitespace

Browse Source
This commit is contained in:
Felix Schütt
2022-09-16 11:46:41 +02:00
parent 7eb4d0fc7c
commit a99a67314c
2 changed files with 92 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/c-api/examples/wasmer-capi-examples-runner/src/lib.rs
View File

@@ -33,6 +33,42 @@ impl Drop for RemoveTestsOnDrop {
} }
} }
fn make_package() {
let wasmer_root_dir = find_wasmer_base_dir();
let _ = std::fs::create_dir_all(&format!("{wasmer_root_dir}/package/lib"));
let _ = std::fs::create_dir_all(&format!("{wasmer_root_dir}/package/include"));
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/lib/c-api/tests/wasm.h"),
&format!("{wasmer_root_dir}/package/include/wasm.h")
);
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/lib/c-api/tests/wasmer.h"),
&format!("{wasmer_root_dir}/package/include/wasmer.h")
);
#[cfg(target_os = "windows")]
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/target/release/wasmer.dll"),
&format!("{wasmer_root_dir}/package/lib")
);
#[cfg(target_os = "windows")]
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/target/release/wasmer.dll.lib"),
&format!("{wasmer_root_dir}/package/lib")
);
#[cfg(not(target_os = "windows"))]
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/target/release/libwasmer.so"),
&format!("{wasmer_root_dir}/package/lib")
);
#[cfg(not(target_os = "windows"))]
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/target/release/libwasmer.lib"),
&format!("{wasmer_root_dir}/package/lib")
);
println!("copying done (make package)");
}
#[derive(Debug)] #[derive(Debug)]
pub struct Config { pub struct Config {
pub wasmer_dir: String, pub wasmer_dir: String,
@@ -88,6 +124,7 @@ impl Config {
cmd.arg("package-capi"); cmd.arg("package-capi");
cmd.current_dir(wasmer_base_dir.clone() + "wasmer"); cmd.current_dir(wasmer_base_dir.clone() + "wasmer");
let result = cmd.output(); let result = cmd.output();
make_package();
println!("make package: {result:#?}"); println!("make package: {result:#?}");
println!("list {}", config.wasmer_dir); println!("list {}", config.wasmer_dir);
@@ -265,17 +302,23 @@ fn test_run() {
let mut command = std::process::Command::new(compiler_cmd); let mut command = std::process::Command::new(compiler_cmd);
if !config.cflags.is_empty() { if !config.cflags.is_empty() {
command.arg(config.cflags.clone()); for f in config.cflags.split_whitespace() {
command.arg(f);
}
} else if !config.wasmer_dir.is_empty() { } else if !config.wasmer_dir.is_empty() {
command.arg("-I"); command.arg("-I");
command.arg(&format!("{}/include", config.wasmer_dir)); command.arg(&format!("{}/include", config.wasmer_dir));
} }
if !config.ldflags.is_empty() { if !config.ldflags.is_empty() {
command.arg(config.ldflags.clone()); for f in config.ldflags.split_whitespace() {
command.arg(f);
}
} }
command.arg(&format!("{manifest_dir}/../{test}.c")); command.arg(&format!("{manifest_dir}/../{test}.c"));
if !config.ldlibs.is_empty() { if !config.ldlibs.is_empty() {
command.arg(config.ldlibs.clone()); for f in config.ldlibs.split_whitespace() {
command.arg(f);
}
} else if !config.wasmer_dir.is_empty() { } else if !config.wasmer_dir.is_empty() {
command.arg(&format!("-L{}/lib", config.wasmer_dir)); command.arg(&format!("-L{}/lib", config.wasmer_dir));
command.arg(&format!("-lwasmer")); command.arg(&format!("-lwasmer"));

49
lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs
View File

@@ -58,6 +58,7 @@ impl Config {
cmd.arg("package-capi"); cmd.arg("package-capi");
cmd.current_dir(wasmer_base_dir.clone() + "wasmer"); cmd.current_dir(wasmer_base_dir.clone() + "wasmer");
let result = cmd.output(); let result = cmd.output();
make_package();
println!("make package: {result:#?}"); println!("make package: {result:#?}");
println!("list {}", config.wasmer_dir); println!("list {}", config.wasmer_dir);
@@ -149,6 +150,42 @@ impl Drop for RemoveTestsOnDrop {
} }
} }
fn make_package() {
let wasmer_root_dir = find_wasmer_base_dir();
let _ = std::fs::create_dir_all(&format!("{wasmer_root_dir}/package/lib"));
let _ = std::fs::create_dir_all(&format!("{wasmer_root_dir}/package/include"));
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/lib/c-api/tests/wasm.h"),
&format!("{wasmer_root_dir}/package/include/wasm.h")
);
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/lib/c-api/tests/wasmer.h"),
&format!("{wasmer_root_dir}/package/include/wasmer.h")
);
#[cfg(target_os = "windows")]
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/target/release/wasmer.dll"),
&format!("{wasmer_root_dir}/package/lib")
);
#[cfg(target_os = "windows")]
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/target/release/wasmer.dll.lib"),
&format!("{wasmer_root_dir}/package/lib")
);
#[cfg(not(target_os = "windows"))]
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/target/release/libwasmer.so"),
&format!("{wasmer_root_dir}/package/lib")
);
#[cfg(not(target_os = "windows"))]
let _ = std::fs::copy(
&format!("{wasmer_root_dir}/target/release/libwasmer.lib"),
&format!("{wasmer_root_dir}/package/lib")
);
println!("copying done (make package)");
}
#[cfg(test)] #[cfg(test)]
pub const CAPI_BASE_TESTS: &[&str] = &[ pub const CAPI_BASE_TESTS: &[&str] = &[
"wasm-c-api/example/callback", "wasm-c-api/example/callback",
@@ -289,17 +326,23 @@ fn test_ok() {
let mut command = std::process::Command::new(compiler_cmd); let mut command = std::process::Command::new(compiler_cmd);
if !config.cflags.is_empty() { if !config.cflags.is_empty() {
command.arg(config.cflags.clone()); for f in config.cflags.split_whitespace() {
command.arg(f);
}
} else if !config.wasmer_dir.is_empty() { } else if !config.wasmer_dir.is_empty() {
command.arg("-I"); command.arg("-I");
command.arg(&format!("{}/include", config.wasmer_dir)); command.arg(&format!("{}/include", config.wasmer_dir));
} }
if !config.ldflags.is_empty() { if !config.ldflags.is_empty() {
command.arg(config.ldflags.clone()); for f in config.ldflags.split_whitespace() {
command.arg(f);
}
} }
command.arg(&format!("{manifest_dir}/../{test}.c")); command.arg(&format!("{manifest_dir}/../{test}.c"));
if !config.ldlibs.is_empty() { if !config.ldlibs.is_empty() {
command.arg(config.ldlibs.clone()); for f in config.ldlibs.split_whitespace() {
command.arg(f);
}
} else if !config.wasmer_dir.is_empty() { } else if !config.wasmer_dir.is_empty() {
command.arg(&format!("-L{}/lib", config.wasmer_dir)); command.arg(&format!("-L{}/lib", config.wasmer_dir));
command.arg(&format!("-lwasmer")); command.arg(&format!("-lwasmer"));