Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-111

[m6w6/libmemcached] / libtest / server.cc

diff --git a/libtest/server.cc b/libtest/server.cc
index d58b362ed5c8927f3cbb9231b4590c667e2318b0..01d15625bf043e2712dccf8658899c40aafa8b53 100644 (file)
--- a/libtest/server.cc
+++ b/libtest/server.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include "mem_config.h"
 #include <libtest/common.h>
 
 #include <cassert>
@@ -210,6 +210,7 @@ bool Server::start()
     _app.use_valgrind();
   }
 
+  out_of_ban_killed(false);
   if (args(_app) == false)
   {
     throw libtest::disconnected(LIBYATL_DEFAULT_PARAM,
@@ -268,7 +269,7 @@ bool Server::start()
   bool pinged= false;
   uint32_t this_wait= 0;
   {
-    uint32_t timeout= 20; // This number should be high enough for valgrind startup (which is slow)
+    uint32_t timeout= 40; // This number should be high enough for valgrind startup (which is slow)
     uint32_t waited;
     uint32_t retry;