Commit ae688808 authored by Daniel Black's avatar Daniel Black Committed by Vicențiu-Marian Ciorbaru

mtr: Only old windows patch-2.5.9 needs --binary

Windows GNU patch 2.7.6 is ok without it.

So account for the old buildbot version for now.

Linux works without it.

--binary fails on FreeBSD-12.0:

$ patch --version
patch 2.0-12u11 FreeBSD
$ patch --binary
patch: unrecognized option `--binary'
parent 26f0cd8a
...@@ -3385,8 +3385,11 @@ sub do_before_run_mysqltest($) ...@@ -3385,8 +3385,11 @@ sub do_before_run_mysqltest($)
# to be able to distinguish them from manually created # to be able to distinguish them from manually created
# version-controlled results, and to ignore them in git. # version-controlled results, and to ignore them in git.
my $dest = "$base_file$suites.result~"; my $dest = "$base_file$suites.result~";
my @cmd = ($exe_patch, qw/--binary -r - -f -s -o/, my @cmd = ($exe_patch);
$dest, $base_result, $resfile); if ($^O eq "MSWin32") {
push @cmd, '--binary';
}
push @cmd, (qw/-r - -f -s -o/, $dest, $base_result, $resfile);
if (-w $resdir) { if (-w $resdir) {
# don't rebuild a file if it's up to date # don't rebuild a file if it's up to date
unless (-e $dest and -M $dest < -M $resfile unless (-e $dest and -M $dest < -M $resfile
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment