diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-09-29 08:57:02 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:07:30 -0500 |
| commit | 59f43d2b58271c4beeab14104014dcd1ae059997 (patch) | |
| tree | 80c0a6998d723a8c5de775fe9549e3cdea7a0dfe | |
| parent | 91a0879b1f317bf3f64867cd4f9494afab30ca2d (diff) | |
| download | samba-59f43d2b58271c4beeab14104014dcd1ae059997.tar.gz samba-59f43d2b58271c4beeab14104014dcd1ae059997.tar.bz2 samba-59f43d2b58271c4beeab14104014dcd1ae059997.zip | |
r25427: fix SELFTEST RUNTIME calculation for the build-farm
metze
(This used to be commit 554d56aa16c147bbb383e4a40d7fc11fa405a3a8)
| -rw-r--r-- | source4/selftest/output/buildfarm.pm | 9 | ||||
| -rw-r--r-- | source4/selftest/output/plain.pm | 3 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source4/selftest/output/buildfarm.pm b/source4/selftest/output/buildfarm.pm index 953f009c7d..cf30bce6c8 100644 --- a/source4/selftest/output/buildfarm.pm +++ b/source4/selftest/output/buildfarm.pm @@ -7,10 +7,10 @@ use Exporter; use strict; -sub new($$) { - my ($class) = @_; +sub new($$$$) { + my ($class, $verbose, $immediate, $statistics) = @_; my $self = { - start => time(), + statistics => $statistics, test_output => {} }; bless($self, $class); @@ -21,11 +21,12 @@ sub start_testsuite($$) my ($self, $state) = @_; my $out = ""; + my $duration = $state->{START_TIME} - $self->{statistics}->{START_TIME}; $out .= "--==--==--==--==--==--==--==--==--==--==--\n"; $out .= "Running test $state->{NAME} (level 0 stdout)\n"; $out .= "--==--==--==--==--==--==--==--==--==--==--\n"; $out .= scalar(localtime())."\n"; - $out .= "SELFTEST RUNTIME: " . ($state->{START_TIME} - $self->{START_TIME}) . "s\n"; + $out .= "SELFTEST RUNTIME: " . $duration . "s\n"; $out .= "NAME: $state->{NAME}\n"; $out .= "CMD: $state->{CMD}\n"; diff --git a/source4/selftest/output/plain.pm b/source4/selftest/output/plain.pm index d52c4846c0..12236e518f 100644 --- a/source4/selftest/output/plain.pm +++ b/source4/selftest/output/plain.pm @@ -13,8 +13,7 @@ sub new($$$$) { immediate => $immediate, statistics => $statistics, test_output => {}, - suitesfailed => [], - start => time() + suitesfailed => [] }; bless($self, $class); } |