diff options
| author | Daniel Black <daniel@linux.ibm.com> | 2020-03-31 11:39:36 +1100 |
|---|---|---|
| committer | Anel Husakovic <anel@mariadb.org> | 2020-04-05 12:59:33 +0200 |
| commit | dd31080273df97cfdcb416a6bc84da938e937e65 (patch) | |
| tree | c402df53fcde4dac4fa80dae774978a0674af9b4 | |
| parent | 64b70b09e6ac253b7915f6120ade5e69fa750b18 (diff) | |
| download | mariadb-git-bb-5.5-anel-PR1488.tar.gz | |
mtr: FreeBSD's patch has no --binarybb-5.5-anel-PR1488
This is true in FreeBSD-12.0
$ patch --version
patch 2.0-12u11 FreeBSD
$ patch --binary
patch: unrecognized option `--binary'
PR 1488
| -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 6d32e97d6b4..a953488eca4 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3719,8 +3719,11 @@ sub do_before_run_mysqltest($) # to be able to distinguish them from manually created # version-controlled results, and to ignore them in bzr. 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 ne "freebsd") { + 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 |