[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  a0f810e selftest: allow more time for tests
      from  dcfa6c0 torture: Fix CID 1426987 Incorrect expression (UNUSED_VALUE)

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit a0f810e7e39cde003c9c5e0cb701846472e80a74
Author: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
Date:   Thu Dec 28 11:45:49 2017 +1300

    selftest: allow more time for tests
    
    Maybe make test *should* run in under 4 hours, but it currently
    doesn't.
    
    Signed-off-by: Douglas Bagnall <douglas.bagnall at catalyst.net.nz>
    Reviewed-by: Stefan Metzmacher <metze at samba.org>
    
    Autobuild-User(master): Stefan Metzmacher <metze at samba.org>
    Autobuild-Date(master): Fri Dec 29 02:48:59 CET 2017 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 selftest/selftest.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 2316f9f..ff19d59 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -441,8 +441,8 @@ if ($opt_testenv) {
     # 1 year should be enough :-)
     $server_maxtime = 365 * 24 * 60 * 60;
 } else {
-    # make test should run under 4 hours
-    $server_maxtime = 4 * 60 * 60;
+    # make test should run under 5 hours
+    $server_maxtime = 5 * 60 * 60;
 }
 
 if (defined($ENV{SMBD_MAXTIME}) and $ENV{SMBD_MAXTIME} ne "") {


-- 
Samba Shared Repository