database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

MDEV-13043 Skipped tests ignore warning suppressions

Browse Source
This commit is contained in:
Elena Stepanova
2017-06-09 17:22:59 +03:00
committed by Marko Mäkelä
parent 3005cebc96
commit 3976ec1e83
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/lib/mtr_report.pm
View File

@ -208,6 +208,10 @@ sub mtr_report_test ($) {
{ {
mtr_report("[ skipped ]"); mtr_report("[ skipped ]");
} }
if ( $tinfo->{'warnings'} )
{
mtr_report($tinfo->{'warnings'});
}
} }
elsif ($result eq 'MTR_RES_PASSED') elsif ($result eq 'MTR_RES_PASSED')
{ {

11
mysql-test/mysql-test-run.pl
View File

@ -4025,12 +4025,13 @@ sub run_testcase ($$) {
{ {
my $res= $test->exit_status(); my $res= $test->exit_status();
if ($res == 0 and $opt_warnings and check_warnings($tinfo) ) if (($res == 0 or $res == 62) and $opt_warnings and check_warnings($tinfo) )
{ {
# Test case suceeded, but it has produced unexpected # If test case suceeded, but it has produced unexpected
# warnings, continue in $res == 1 # warnings, continue with $res == 1;
$res= 1; # but if the test was skipped, it should remain skipped
resfile_output($tinfo->{'warnings'}) if $opt_resfile; $res= 1 if $res == 0;
resfile_output($tinfo->{'warnings'}) if $opt_resfile;
} }
if ( $res == 0 ) if ( $res == 0 )