diff options
| author | Elena Stepanova <elenst@montyprogram.com> | 2017-06-09 17:22:59 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-06-12 17:21:30 +0300 |
| commit | 3976ec1e83d7ae1079b4afa4c12b4ec533d665f6 (patch) | |
| tree | 76d89966be1d3bca8d8bca266aec1b10c2645dc1 | |
| parent | 3005cebc96ef65dc54bf6caaa5e089d52d52e7ff (diff) | |
| download | mariadb-git-3976ec1e83d7ae1079b4afa4c12b4ec533d665f6.tar.gz | |
MDEV-13043 Skipped tests ignore warning suppressions
| -rw-r--r-- | mysql-test/lib/mtr_report.pm | 4 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 97ace54f0fb..d93d8adf34c 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -208,6 +208,10 @@ sub mtr_report_test ($) { { mtr_report("[ skipped ]"); } + if ( $tinfo->{'warnings'} ) + { + mtr_report($tinfo->{'warnings'}); + } } elsif ($result eq 'MTR_RES_PASSED') { diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index b5c43344797..64483fa50f1 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -4025,12 +4025,13 @@ sub run_testcase ($$) { { 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 ) |