diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:59:31 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-06-27 10:59:31 +0300 |
commit | 87bd79b1e7b15cd323e4b4ed8abe139895bf5b6f (patch) | |
tree | 2e626434665ec6bb569feb8a850908dda7b6aa70 /mysql-test/mariadb-test-run.pl | |
parent | d96436c99905ed30494c6a52841ca17a558f44c6 (diff) | |
parent | ea847cbeaf76817aab8817f849e80e8ce8b2b43c (diff) | |
download | mariadb-git-87bd79b1e7b15cd323e4b4ed8abe139895bf5b6f.tar.gz |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/mariadb-test-run.pl')
-rwxr-xr-x | mysql-test/mariadb-test-run.pl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl index 1449d3ecb9a..1ee515c190a 100755 --- a/mysql-test/mariadb-test-run.pl +++ b/mysql-test/mariadb-test-run.pl @@ -3274,17 +3274,21 @@ sub do_before_run_mysqltest($) if ($^O eq "MSWin32") { push @cmd, '--binary'; } - push @cmd, (qw/-r - -f -s -o/, $dest, $base_result, $resfile); + 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 and -M $dest < -M $base_result) { run_system(@cmd); + rename $cmd[-3], $dest or unlink $cmd[-3]; } } else { - $cmd[-3] = $dest = $opt_tmpdir . '/' . basename($dest); + $dest = $opt_tmpdir . '/' . basename($dest); + $cmd[-3] = $dest . $$; run_system(@cmd); + rename $cmd[-3], $dest or unlink $cmd[-3]; } + $tinfo->{result_file} = $dest; } |