From 0778ddf99f77c0aa618b51d50d63ef2c1c3d43b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sch=C3=BCtt?= Date: Wed, 16 Nov 2022 14:00:55 +0100 Subject: [PATCH] Revert renaming wasm.o / wasm.obj differences --- tests/integration/cli/tests/create_exe.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/integration/cli/tests/create_exe.rs b/tests/integration/cli/tests/create_exe.rs index 4cdf9530b..f99b035fd 100644 --- a/tests/integration/cli/tests/create_exe.rs +++ b/tests/integration/cli/tests/create_exe.rs @@ -91,6 +91,9 @@ struct WasmerCreateObj { impl Default for WasmerCreateObj { fn default() -> Self { + #[cfg(not(windows))] + let output_object_path = PathBuf::from("wasm.o"); + #[cfg(windows)] let output_object_path = PathBuf::from("wasm.obj"); Self { current_dir: std::env::current_dir().unwrap(), @@ -268,6 +271,9 @@ fn create_obj(args: Vec<&'static str>, keyword_needle: &str, keyword: &str) -> a let wasm_path = operating_dir.join(create_exe_test_wasm_path()); + #[cfg(not(windows))] + let object_path = operating_dir.join("wasm.o"); + #[cfg(windows)] let object_path = operating_dir.join("wasm.obj"); let output: Vec = WasmerCreateObj { @@ -330,6 +336,9 @@ fn create_exe_with_object_input(args: Vec<&'static str>) -> anyhow::Result<()> { let wasm_path = operating_dir.join(create_exe_test_wasm_path()); + #[cfg(not(windows))] + let object_path = operating_dir.join("wasm.o"); + #[cfg(windows)] let object_path = operating_dir.join("wasm.obj"); WasmerCreateObj {