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

Bug#40705 mtr's check-warnings fails sporadically in pushbuild

Browse Source 
- Change the logic slightly for when and how errors from
   check-warnings and check-testcase are reported. The prevoius logic
   reporting testfailed twice and that might have caused this.
 - Also print result code returned from mysqltest when it is "unexpected"
This commit is contained in:
Magnus Svensson
2008-11-14 13:19:37 +01:00
parent 4e98cbab0d
commit 41fdb64682
1 changed files with 12 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2802,7 +2802,8 @@ sub check_testcase($$)
{ {
my $report= mtr_grab_file($err_file); my $report= mtr_grab_file($err_file);
$tinfo->{comment}.= $tinfo->{comment}.=
"Could not execute 'check-testcase' $mode testcase '$tname':\n"; "Could not execute 'check-testcase' $mode ".
"testcase '$tname' (res: $res):\n";
$tinfo->{comment}.= $report; $tinfo->{comment}.= $report;
$result= 2; $result= 2;
@ -3159,19 +3160,15 @@ sub run_testcase ($) {
my $res= $test->exit_status(); my $res= $test->exit_status();
if ($res == 0 and $opt_warnings and check_warnings($tinfo) )
{
# Test case suceeded, but it has produced unexpected
# warnings, continue in $res == 1
$res= 1;
}
if ( $res == 0 ) if ( $res == 0 )
{ {
if ( $opt_warnings and check_warnings($tinfo) )
{
# Found unexpected warnings
report_failure_and_restart($tinfo);
$res= 1;
}
else
{
mtr_report_test_passed($tinfo);
}
my $check_res; my $check_res;
if ( $opt_check_testcases and if ( $opt_check_testcases and
$check_res= check_testcase($tinfo, "after")) $check_res= check_testcase($tinfo, "after"))
@ -3187,6 +3184,7 @@ sub run_testcase ($) {
return 1; return 1;
} }
} }
mtr_report_test_passed($tinfo);
} }
elsif ( $res == 62 ) elsif ( $res == 62 )
{ {
@ -3407,7 +3405,8 @@ sub check_warnings ($) {
{ {
my $report= mtr_grab_file($err_file); my $report= mtr_grab_file($err_file);
$tinfo->{comment}.= $tinfo->{comment}.=
"Could not execute 'check-warnings' for testcase '$tname':"; "Could not execute 'check-warnings' for ".
"testcase '$tname' (res: $res):\n";
$tinfo->{comment}.= $report; $tinfo->{comment}.= $report;
$result= 2; $result= 2;
@ -3428,11 +3427,6 @@ sub check_warnings ($) {
return $result; return $result;
} }
return $res;
return $res; return $res;
} }