1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bug #40924 please print timestamp when mtr fails

Browse Source 
Added text "Test ended at <time>" after failure reports
This commit is contained in:
Bjorn Munch 2008-12-03 14:11:03 +01:00
parent 0456662539
commit d2e0e3ce35
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
# -*- cperl -*- # -*- cperl -*-
# Copyright (C) 2004-2006 MySQL AB # Copyright (C) 2004-2006 MySQL AB, 2008 Sun Microsystems, Inc.
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -110,22 +110,26 @@ sub mtr_report_test ($) {
if ($result eq 'MTR_RES_FAILED'){ if ($result eq 'MTR_RES_FAILED'){
my $timest = format_time();
if ( $warnings ) if ( $warnings )
{ {
mtr_report("[ fail ] Found warnings in server log file!"); mtr_report("[ fail ] Found warnings in server log file!");
mtr_report(" Test ended at $timest");
mtr_report($warnings); mtr_report($warnings);
return; return;
} }
my $timeout= $tinfo->{'timeout'}; my $timeout= $tinfo->{'timeout'};
if ( $timeout ) if ( $timeout )
{ {
mtr_report("[ fail ] timeout after $timeout minutes"); mtr_report("[ fail ] timeout after $timeout seconds");
mtr_report(" Test ended at $timest");
mtr_report("\n$tinfo->{'comment'}"); mtr_report("\n$tinfo->{'comment'}");
return; return;
} }
else else
{ {
mtr_report("[ fail ]"); mtr_report("[ fail ]\n Test ended at $timest");
} }
if ( $logfile ) if ( $logfile )
@ -372,6 +376,13 @@ use Time::localtime;
use Time::HiRes qw(gettimeofday); use Time::HiRes qw(gettimeofday);
sub format_time {
my $tm= localtime();
return sprintf("%4d-%02d-%02d %02d:%02d:%02d",
$tm->year + 1900, $tm->mon+1, $tm->mday,
$tm->hour, $tm->min, $tm->sec);
}
my $t0= gettimeofday(); my $t0= gettimeofday();
sub _timestamp { sub _timestamp {