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)

diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm
index b182d094b3a6ad01378ba94482db3f93342fde59..e393fe779881c34a0d1bbc0fa3a91a17b9c994b2 100644 (file)
--- 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 2477cb153211e07668e089d84c98258ad2ed9910..a9b1708f6019276c23d529e6613c76e275e713c0 100755 (executable)
--- 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";