uutils/diffutils
0
0
Fork 0
mirror of https://github.com/uutils/diffutils.git synced 2026-06-10 15:48:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

tests: fix "gpatch --version" error message on mac (#235)

Browse Source 
When we fail to find `gpatch`, don't say that we failed to find `patch`.

Cosmetic fix to commit 1254f146f8 ("tests: validate "patch" and "ed"
commands once, print meaningful messages (#226)")

This is an extremely minor fix because the error message already printed
"gpatch validation failed, no such file or directory" even before this
commit.

Signed-off-by: Marc Herbert <Marc.Herbert@gmail.com>
This commit is contained in:
Marc Herbert
2026-06-03 08:11:51 -04:00
committed by GitHub
parent 58da229c09
commit ec3428b48f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils.rs
+2 -2
View File
@@ -150,7 +150,7 @@ pub mod testcmds {
pub static PATCH_CMD: CmdFactory = CmdFactory { pub static PATCH_CMD: CmdFactory = CmdFactory {
cmd: if cfg!(target_os = "macos") { cmd: if cfg!(target_os = "macos") {
"gpatch" // brew install patch "gpatch" // brew install gpatch
} else { } else {
"patch" "patch"
}, },
@@ -160,7 +160,7 @@ pub mod testcmds {
let output = Command::new(myself.cmd) let output = Command::new(myself.cmd)
.arg("--version") .arg("--version")
.output() .output()
.expect("`patch --version` failed"); .expect(format!("`{} --version` failed", myself.cmd).as_str());
// Non-GNU versions have subtle differences. When some newlines are missing in some test // Non-GNU versions have subtle differences. When some newlines are missing in some test
// patches, the macOS version can even stall the whole test run. // patches, the macOS version can even stall the whole test run.
assert!(output.stdout.starts_with(b"GNU patch")); assert!(output.stdout.starts_with(b"GNU patch"));