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

merge 49672

Browse Source
This commit is contained in:
Bjorn Munch
2010-01-06 09:52:55 +01:00
parent 385f3f87c9 b82642966b
commit dc3a76b2da
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3502,7 +3502,7 @@ sub run_testcase ($) {
{ {
# mysqltest failed, probably crashed # mysqltest failed, probably crashed
$tinfo->{comment}= $tinfo->{comment}=
"mysqltest failed with unexpected return code $res"; "mysqltest failed with unexpected return code $res\n";
report_failure_and_restart($tinfo); report_failure_and_restart($tinfo);
} }
@ -4093,6 +4093,20 @@ sub report_failure_and_restart ($) {
# about what failed has been saved to file. Save the report # about what failed has been saved to file. Save the report
# in tinfo # in tinfo
$tinfo->{logfile}= mtr_fromfile($logfile); $tinfo->{logfile}= mtr_fromfile($logfile);
# If no newlines in the test log:
# (it will contain the CURRENT_TEST written by mtr, so is not empty)
if ($tinfo->{logfile} !~ /\n/)
{
# Show how far it got before suddenly failing
$tinfo->{comment}.= "mysqltest failed but provided no output\n";
my $log_file_name= $opt_vardir."/log/".$tinfo->{shortname}.".log";
if (-e $log_file_name) {
$tinfo->{comment}.=
"The result from queries just before the failure was:".
"\n< snip >\n".
mtr_lastlinesfromfile($log_file_name, 20)."\n";
}
}
} }
else else
{ {