From dd5a5cc8071ee9c05a9a712a953557901e5403a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20Sch=C3=BCtt?= Date: Thu, 15 Sep 2022 21:47:59 +0200 Subject: [PATCH] Debug /include directory and don't emit empty ldflags --- .../wasmer-capi-examples-runner/src/lib.rs | 4 +++- .../tests/wasmer-c-api-test-runner/src/lib.rs | 18 +++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/lib/c-api/examples/wasmer-capi-examples-runner/src/lib.rs b/lib/c-api/examples/wasmer-capi-examples-runner/src/lib.rs index 559ac28ff..e80002cf6 100644 --- a/lib/c-api/examples/wasmer-capi-examples-runner/src/lib.rs +++ b/lib/c-api/examples/wasmer-capi-examples-runner/src/lib.rs @@ -271,7 +271,9 @@ fn test_run() { command.arg("-I"); command.arg(&format!("{}/include", config.wasmer_dir)); } - command.arg(config.ldflags.clone()); + if !config.ldflags.is_empty() { + command.arg(config.ldflags.clone()); + } command.arg(&format!("{manifest_dir}/../{test}.c")); if !config.ldlibs.is_empty() { command.arg(config.ldlibs.clone()); diff --git a/lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs b/lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs index 226c741d7..0ed31bed9 100644 --- a/lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs +++ b/lib/c-api/tests/wasmer-c-api-test-runner/src/lib.rs @@ -73,6 +73,20 @@ impl Config { println!("error in reading config.wasmer_dir: {e}"); } }; + + println!("list {}/include", config.wasmer_dir); + match std::fs::read_dir(&config.wasmer_dir) { + Ok(o) => { + for entry in o { + let entry = entry.unwrap(); + let path = entry.path(); + println!(" {:?}", path.file_name()); + } + } + Err(e) => { + println!("error in reading config.wasmer_dir: {e}"); + } + }; } } if config.root_dir.is_empty() { @@ -281,7 +295,9 @@ fn test_ok() { command.arg("-I"); command.arg(&format!("{}/include", config.wasmer_dir)); } - command.arg(config.ldflags.clone()); + if !config.ldflags.is_empty() { + command.arg(config.ldflags.clone()); + } command.arg(&format!("{manifest_dir}/../{test}.c")); if !config.ldlibs.is_empty() { command.arg(config.ldlibs.clone());