Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marc-hb wants to merge 1 commit into
base: main
Choose a base branch
from
+2 −2
Open

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ pub mod testcmds {

pub static PATCH_CMD: CmdFactory = CmdFactory {
cmd: if cfg!(target_os = "macos") {
"gpatch" // brew install patch
"gpatch" // brew install gpatch
} else {
"patch"
},
Expand All @@ -160,7 +160,7 @@ pub mod testcmds {
let output = Command::new(myself.cmd)
.arg("--version")
.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
// patches, the macOS version can even stall the whole test run.
assert!(output.stdout.starts_with(b"GNU patch"));
Expand Down
Loading