diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 11:13:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 11:13:40 +0300 |
| commit | e380f447421882d8a0700e8821e55e2786b426ad (patch) | |
| tree | 63a1657bc9c9add1233a1c3b7dd41e34110f0236 /mysql-test/lib | |
| parent | 1893a1370d744408a16548196a6dc62136157399 (diff) | |
| parent | 6b2c8cac1b52bee934ac88cc21c6023f48b69e57 (diff) | |
| download | mariadb-git-e380f447421882d8a0700e8821e55e2786b426ad.tar.gz | |
Merge 10.1 into 10.2
Diffstat (limited to 'mysql-test/lib')
| -rw-r--r-- | mysql-test/lib/mtr_report.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 0b99eafa4cf..d228e9406e0 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -473,7 +473,7 @@ sub mtr_report_stats ($$$$) { $comment =~ s/[\"]//g; # if a test case has to be retried it should have the result MTR_RES_FAILED in jUnit XML - if ($test->{'result'} eq "MTR_RES_FAILED" || $test->{'retries'}) { + if ($test->{'result'} eq "MTR_RES_FAILED" || $test->{'retries'} > 0) { my $logcontents = $test->{'logfile-failed'} || $test->{'logfile'}; $xml_report .= qq(>\n\t\t\t<failure message="" type="MTR_RES_FAILED">\n<![CDATA[$logcontents]]>\n\t\t\t</failure>\n\t\t</testcase>\n); @@ -639,6 +639,8 @@ sub mtr_error (@) { } else { + use Carp qw(cluck); + cluck "Error happened" if $verbose > 0; exit(1); } } |