diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 11:41:51 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-05-20 11:41:51 +0300 |
| commit | f4f0ef3e3771281b7f25bc26cc2cbf4e2dbe325a (patch) | |
| tree | 78145ee56dede4db4e0851f575cd4fffb4f2e649 /mysql-test/lib | |
| parent | d4f97e2086848cedfdd35a6c1cf286f8dad26c5c (diff) | |
| parent | e380f447421882d8a0700e8821e55e2786b426ad (diff) | |
| download | mariadb-git-f4f0ef3e3771281b7f25bc26cc2cbf4e2dbe325a.tar.gz | |
Merge 10.2 into 10.3
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 25d3256ca4e..d79a71b2fb4 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); } } |