diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-03-31 11:39:36 +1100 |
|---|---|---|
| committer | Vicențiu-Marian Ciorbaru <vicentiu@mariadb.org> | 2020-04-14 16:58:53 +0300 |
| commit | ae688808fab96f7d3995839d07a61b7990fe51cd (patch) | |
| tree | b060df840cb9d37e760de98f65cdc9d1e39a8396 | |
| parent | 26f0cd8afcbdceff22223d4c521c3ce73ee09fda (diff) | |
| download | mariadb-git-ae688808fab96f7d3995839d07a61b7990fe51cd.tar.gz | |
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'
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 677dd58f99b..fc152b232ca 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3385,8 +3385,11 @@ sub do_before_run_mysqltest($) # to be able to distinguish them from manually created # version-controlled results, and to ignore them in git. my $dest = "$base_file$suites.result~"; - my @cmd = ($exe_patch, qw/--binary -r - -f -s -o/, - $dest, $base_result, $resfile); + my @cmd = ($exe_patch); + if ($^O eq "MSWin32") { + push @cmd, '--binary'; + } + push @cmd, (qw/-r - -f -s -o/, $dest, $base_result, $resfile); if (-w $resdir) { # don't rebuild a file if it's up to date unless (-e $dest and -M $dest < -M $resfile |