Fix harness tests

harness/src/build.rs

@@ -61,7 +61,8 @@ impl ToString for BuildMode {
 pub fn get_files_index(target_folder: &PathBuf) -> Vec<PathBuf> {
     let mut paths = Vec::with_capacity(BINARIES.len());
     for binary in BINARIES {
-        paths.push(util::concat_path(binary, target_folder));
+        let binary = util::add_extension(binary);
+        paths.push(util::concat_path(&binary, target_folder));
     }
     paths
 }

harness/src/tests.rs

@@ -57,14 +57,26 @@ fn file_names() {
     let files_index = build::get_files_index(&target_folder_debug);
     let expected_files_index: Vec<PathBuf> = build::BINARIES
         .iter()
-        .map(|bin| format!("{WORKSPACE_ROOT}target/debug/{bin}").into())
+        .map(|bin| {
+            {
+                let bin = util::add_extension(bin);
+                format!("{WORKSPACE_ROOT}target/debug/{bin}")
+            }
+            .into()
+        })
         .collect();
     assert_eq!(files_index, expected_files_index);
     // files index for release
     let files_index = build::get_files_index(&target_folder_release);
     let expected_files_index: Vec<PathBuf> = build::BINARIES
         .iter()
-        .map(|bin| format!("{WORKSPACE_ROOT}target/release/{bin}").into())
+        .map(|bin| {
+            {
+                let bin = util::add_extension(bin);
+                format!("{WORKSPACE_ROOT}target/release/{bin}")
+            }
+            .into()
+        })
         .collect();
     assert_eq!(files_index, expected_files_index);
     // linux package name
@@ -92,14 +104,26 @@ fn file_names() {
     let files_index = build::get_files_index(&target_folder_debug);
     let expected_files_index: Vec<PathBuf> = build::BINARIES
         .iter()
-        .map(|bin| format!("{WORKSPACE_ROOT}target/{TARGET}/debug/{bin}").into())
+        .map(|bin| {
+            format!(
+                "{WORKSPACE_ROOT}target/{TARGET}/debug/{bin}",
+                bin = util::add_extension(bin)
+            )
+            .into()
+        })
         .collect();
     assert_eq!(files_index, expected_files_index);
     // files index for release
     let files_index = build::get_files_index(&target_folder_release);
     let expected_files_index: Vec<PathBuf> = build::BINARIES
         .iter()
-        .map(|bin| format!("{WORKSPACE_ROOT}target/{TARGET}/release/{bin}").into())
+        .map(|bin| {
+            format!(
+                "{WORKSPACE_ROOT}target/{TARGET}/release/{bin}",
+                bin = util::add_extension(bin)
+            )
+            .into()
+        })
         .collect();
     assert_eq!(files_index, expected_files_index);
     // linux package name

harness/src/util.rs

@@ -90,11 +90,18 @@ pub fn get_target_folder(mode: BuildMode) -> PathBuf {
     }
 }
 
-/// Returns `{body}/{binary_name}(.exe if on windows)`
+/// Get the extension
+pub fn add_extension(binary_name: &str) -> String {
+    if cfg!(windows) {
+        format!("{binary_name}.exe")
+    } else {
+        binary_name.to_owned()
+    }
+}
+
+/// Returns `{body}/{binary_name}`
 pub fn concat_path(binary_name: &str, body: impl AsRef<Path>) -> PathBuf {
     let mut pb = PathBuf::from(body.as_ref());
-    #[cfg(windows)]
-    let binary_name = format!("{}.exe", binary_name);
     pb.push(binary_name);
     pb
 }