summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-04-20 06:09:37 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:13 -0500
commitb9ed2cc4ba760a90295ca31b0f09a2dd26a6629b (patch)
tree9c5f20e527bb0531939d3390d3f4cc440a128b1d
parent1fc97d3ee4536d19cfe4793bd69c6bd1d478103d (diff)
downloadsamba-b9ed2cc4ba760a90295ca31b0f09a2dd26a6629b.tar.gz
samba-b9ed2cc4ba760a90295ca31b0f09a2dd26a6629b.tar.bz2
samba-b9ed2cc4ba760a90295ca31b0f09a2dd26a6629b.zip
r22398: try to let all tests pass 5400 seconds is not enough
with the amount of tests we run now. metze (This used to be commit b0a1f730f9d83546064b7438b8dac350eeb32a3b)
-rw-r--r--source4/script/tests/Samba4.pm2
-rwxr-xr-xsource4/script/tests/selftest.pl4
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index b182d094b3..e393fe7798 100644
--- a/source4/script/tests/Samba4.pm
+++ b/source4/script/tests/Samba4.pm
@@ -710,7 +710,7 @@ sub setup_member($$$$)
my $env = $self->provision_member($path, $dc_vars);
- $self->check_or_start($env, ($ENV{SMBD_MAX_TIME} or 5400));
+ $self->check_or_start($env, ($ENV{SMBD_MAX_TIME} or 6500));
$self->wait_for_start($env);
diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl
index 2477cb1532..a9b1708f60 100755
--- a/source4/script/tests/selftest.pl
+++ b/source4/script/tests/selftest.pl
@@ -191,7 +191,7 @@ sub buildfarm_start_msg($)
$out .= "Running test $state->{NAME} (level 0 stdout)\n";
$out .= "--==--==--==--==--==--==--==--==--==--==--\n";
$out .= scalar(localtime())."\n";
- $out .= "SELFTEST RUNTIME: " . ($state->{START} - $start) . "s";
+ $out .= "SELFTEST RUNTIME: " . ($state->{START} - $start) . "s\n";
$out .= "NAME: $state->{NAME}\n";
$out .= "CMD: $state->{CMD}\n";
@@ -212,7 +212,7 @@ sub buildfarm_end_msg($$$)
my ($state, $expected_ret, $ret) = @_;
my $out = "";
- $out .= "TEST RUNTIME: " . (time() - $state->{START}) . "s";
+ $out .= "TEST RUNTIME: " . (time() - $state->{START}) . "s\n";
if ($ret == $expected_ret) {
$out .= "ALL OK\n";