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

Replace all - with - in $opt name

Browse Source
This commit is contained in:
unknown
2008-04-24 14:15:15 +02:00
parent d21e7383d1
commit d4a9ed4b50
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/lib/mtr_cases.pm
View File

@ -46,7 +46,7 @@ sub collect_option {
my ($opt, $value)= @_; my ($opt, $value)= @_;
# Convert - to _ in option name # Convert - to _ in option name
$opt =~ s/-/_/; $opt =~ s/-/_/g;
no strict 'refs'; no strict 'refs';
${$opt}= $value; ${$opt}= $value;
} }

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

@ -26,8 +26,7 @@ our @EXPORT= qw(report_option mtr_print_line mtr_print_thick_line
mtr_print_header mtr_report mtr_report_stats mtr_print_header mtr_report mtr_report_stats
mtr_warning mtr_error mtr_debug mtr_verbose mtr_warning mtr_error mtr_debug mtr_verbose
mtr_verbose_restart mtr_report_test_passed mtr_verbose_restart mtr_report_test_passed
mtr_report_test_failed mtr_report_test_skipped mtr_report_test_failed mtr_report_test_skipped);
mtr_report_stats);
use mtr_match; use mtr_match;
require "mtr_io.pl"; require "mtr_io.pl";
@ -35,12 +34,13 @@ require "mtr_io.pl";
my $tot_real_time= 0; my $tot_real_time= 0;
our $timestamp= 0; our $timestamp= 0;
our $timediff= 1;
sub report_option { sub report_option {
my ($opt, $value)= @_; my ($opt, $value)= @_;
# Convert - to _ in option name # Convert - to _ in option name
$opt =~ s/-/_/; $opt =~ s/-/_/g;
no strict 'refs'; no strict 'refs';
${$opt}= $value; ${$opt}= $value;
} }
@ -228,20 +228,20 @@ sub mtr_report_stats ($) {
# Print a list of check_testcases that failed(if any) # Print a list of check_testcases that failed(if any)
if ( $::opt_check_testcases ) if ( $::opt_check_testcases )
{ {
my @check_testcases= (); my %check_testcases;
foreach my $tinfo (@$tests) foreach my $tinfo (@$tests)
{ {
if ( defined $tinfo->{'check_testcase_failed'} ) if ( defined $tinfo->{'check_testcase_failed'} )
{ {
push(@check_testcases, $tinfo->{'name'}); $check_testcases{$tinfo->{'name'}}= 1;
} }
} }
if ( @check_testcases ) if ( keys %check_testcases )
{ {
print "Check of testcase failed for: "; print "Check of testcase failed for: ";
print join(" ", @check_testcases); print join(" ", keys %check_testcases);
print "\n\n"; print "\n\n";
} }
} }
@ -330,13 +330,29 @@ sub mtr_print_header () {
use Time::localtime; use Time::localtime;
use Time::HiRes qw(gettimeofday);
my $t0= gettimeofday();
sub _timestamp { sub _timestamp {
return "" unless $timestamp; return "" unless $timestamp;
my $diff;
if ($timediff){
my $t1= gettimeofday();
my $elapsed= $t1 - $t0;
$diff= sprintf(" +%02.3f", $elapsed);
# Save current time for next lap
$t0= $t1;
}
my $tm= localtime(); my $tm= localtime();
return sprintf("%02d%02d%02d %2d:%02d:%02d ", return sprintf("%02d%02d%02d %2d:%02d:%02d%s ",
$tm->year % 100, $tm->mon+1, $tm->mday, $tm->year % 100, $tm->mon+1, $tm->mday,
$tm->hour, $tm->min, $tm->sec); $tm->hour, $tm->min, $tm->sec, $diff);
} }