CalvinBackup/banderole
1
0
Fork 0
mirror of https://github.com/zhom/banderole.git synced 2026-06-06 06:23:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

test: retry with copied binaries

Browse Source
This commit is contained in:
zhom
2025-08-10 05:34:57 +04:00
parent b55261b56c
commit ed791d9ced
1 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/common/mod.rs
+35 -18
View File
@@ -762,30 +762,47 @@ impl BundlerTestHelper {
cmd.current_dir(&work_dir).output()
};
// If NotFound on Windows, retry via cmd /C
// If NotFound on Windows, retry using the copied executable directly with verbatim prefix; else cmd /C
#[cfg(windows)]
let output = match direct {
Ok(o) => Ok(o),
Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
// Retry via cmd /C with proper quoting
fn quote(s: &str) -> String {
let mut out = String::from("\"");
out.push_str(&s.replace('"', "\\\""));
out.push('"');
out
}
let exe_str = exec_to_run.display().to_string();
let mut cmdline = quote(&exe_str);
for a in args {
cmdline.push(' ');
cmdline.push_str(&quote(a));
}
let mut c2 = Command::new("cmd");
c2.args(["/C", &cmdline]).current_dir(&work_dir);
use std::ffi::OsString;
let abs = exec_to_run
.canonicalize()
.unwrap_or_else(|_| exec_to_run.clone());
let mut verbatim: OsString = OsString::from(r"\\?\");
verbatim.push(&abs);
let mut cmd = Command::new(&verbatim);
cmd.args(args).current_dir(&work_dir);
for (key, value) in env_vars {
c2.env(key, value);
cmd.env(key, value);
}
match cmd.output() {
Ok(o2) => Ok(o2),
Err(e2) if e2.kind() == std::io::ErrorKind::NotFound => {
// Fallback to cmd /C with quoting
fn quote(s: &str) -> String {
let mut out = String::from("\"");
out.push_str(&s.replace('"', "\\\""));
out.push('"');
out
}
let exe_str = exec_to_run.display().to_string();
let mut cmdline = quote(&exe_str);
for a in args {
cmdline.push(' ');
cmdline.push_str(&quote(a));
}
let mut c2 = Command::new("cmd");
c2.args(["/C", &cmdline]).current_dir(&work_dir);
for (key, value) in env_vars {
c2.env(key, value);
}
c2.output()
}
Err(e2) => Err(e2),
}
c2.output()
}
Err(e) => Err(e),
};