Skip to content
Permalink
Browse files

MDEV-13043 Skipped tests ignore warning suppressions

  • Loading branch information...
elenst authored and dr-m committed Jun 9, 2017
1 parent 3005ceb commit 3976ec1e83d7ae1079b4afa4c12b4ec533d665f6
Showing with 10 additions and 5 deletions.
  1. +4 −0 mysql-test/lib/mtr_report.pm
  2. +6 −5 mysql-test/mysql-test-run.pl
@@ -208,6 +208,10 @@ sub mtr_report_test ($) {
{
mtr_report("[ skipped ]");
}
if ( $tinfo->{'warnings'} )
{
mtr_report($tinfo->{'warnings'});
}
}
elsif ($result eq 'MTR_RES_PASSED')
{
@@ -4025,12 +4025,13 @@ ($$)
{
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
# warnings, continue in $res == 1
$res= 1;
resfile_output($tinfo->{'warnings'}) if $opt_resfile;
# If test case suceeded, but it has produced unexpected
# warnings, continue with $res == 1;
# but if the test was skipped, it should remain skipped
$res= 1 if $res == 0;
resfile_output($tinfo->{'warnings'}) if $opt_resfile;
}

if ( $res == 0 )

0 comments on commit 3976ec1

Please sign in to comment.
You can’t perform that action at this time.