mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-06 20:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix various compilation errors on windows

Browse Source
This commit is contained in:
Felix Schütt
2022-09-15 11:47:20 +02:00
parent 94baa50bbf
commit ada5810b25
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,8 @@ impl Drop for RemoveTestsOnDrop {
} }
} }
const CAPI_BASE_TESTS: &[&str] = &[ #[cfg(test)]
pub const CAPI_BASE_TESTS: &[&str] = &[
"wasm-c-api/example/callback", "wasm-c-api/example/callback",
"wasm-c-api/example/memory", "wasm-c-api/example/memory",
"wasm-c-api/example/start", "wasm-c-api/example/start",
@@ -70,7 +71,8 @@ const CAPI_BASE_TESTS: &[&str] = &[
"wasm-c-api/example/multi", "wasm-c-api/example/multi",
]; ];
const CAPI_BASE_TESTS_NOT_WORKING: &[&str] = &[ #[allow(unused_variables, dead_code)]
pub const CAPI_BASE_TESTS_NOT_WORKING: &[&str] = &[
"wasm-c-api/example/finalize", "wasm-c-api/example/finalize",
"wasm-c-api/example/hostref", "wasm-c-api/example/hostref",
"wasm-c-api/example/threads", "wasm-c-api/example/threads",
@@ -137,7 +139,7 @@ fn test_ok() {
.expect("could not invoke vcvars64.bat at {vcvars_bat_path}"); .expect("could not invoke vcvars64.bat at {vcvars_bat_path}");
if !output.status.success() { if !output.status.success() {
println!(""); println!();
println!("stdout: {}", String::from_utf8_lossy(&output.stdout)); println!("stdout: {}", String::from_utf8_lossy(&output.stdout));
println!("stderr: {}", String::from_utf8_lossy(&output.stderr)); println!("stderr: {}", String::from_utf8_lossy(&output.stderr));
panic!("failed to invoke vcvars64.bat {test}"); panic!("failed to invoke vcvars64.bat {test}");

2
tests/integration/cli/src/assets.rs
View File

@@ -36,7 +36,7 @@ pub const WASMER_TARGET_PATH2: &str = concat!(
pub const LIBWASMER_FILENAME: &str = "libwasmer.a"; pub const LIBWASMER_FILENAME: &str = "libwasmer.a";
#[cfg(windows)] #[cfg(windows)]
pub const LIBWASMER_PATH: &str = "wasmer.lib"; pub const LIBWASMER_FILENAME: &str = "wasmer.lib";
/// Get the path to the `libwasmer.a` static library. /// Get the path to the `libwasmer.a` static library.
pub fn get_libwasmer_path() -> PathBuf { pub fn get_libwasmer_path() -> PathBuf {