diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2008-12-03 14:11:03 +0100 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2008-12-03 14:11:03 +0100 |
| commit | d2e0e3ce356d2f82cccdeecf62369641d7e20c3a (patch) | |
| tree | 2d078800952f3705f47b4946441116c92ee500a2 /mysql-test/lib/mtr_report.pm | |
| parent | 04566625396c74740405fe3abfab3ef819803ad0 (diff) | |
| download | mariadb-git-d2e0e3ce356d2f82cccdeecf62369641d7e20c3a.tar.gz | |
Bug #40924 please print timestamp when mtr fails
Added text "Test ended at <time>" after failure reports
Diffstat (limited to 'mysql-test/lib/mtr_report.pm')
| -rw-r--r-- | mysql-test/lib/mtr_report.pm | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index 6a46a372c45..70d0a5be687 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -1,5 +1,5 @@ # -*- 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 # 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'){ + my $timest = format_time(); + if ( $warnings ) { mtr_report("[ fail ] Found warnings in server log file!"); + mtr_report(" Test ended at $timest"); mtr_report($warnings); return; } my $timeout= $tinfo->{'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'}"); return; } else { - mtr_report("[ fail ]"); + mtr_report("[ fail ]\n Test ended at $timest"); } if ( $logfile ) @@ -372,6 +376,13 @@ use Time::localtime; 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(); sub _timestamp { |