Commit 97b0eb92 authored by Bjorn Munch's avatar Bjorn Munch
Browse files

Bug #40924 please print timestamp when mtr fails 

Added text "Test ended at <time>" after failure reports
parent ee6c9dda

mysql-test/lib/mtr_report.pm

+14 −3
Original line number Diff line number Diff line 
# -*- 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 {