X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver_container.cc;h=e9b2f4e094b5572a47308535873bd9d558b335d5;hb=543d6be67139ee7cb47c0c8e7d383743f4e68857;hp=5e081f62776c1627c44f008f95ba15ee5ac7506d;hpb=bcc7e71dd0d2c7d875ddb3583fd5ab2585304642;p=awesomized%2Flibmemcached

diff --git a/libtest/server_container.cc b/libtest/server_container.cc
index 5e081f62..e9b2f4e0 100644
--- a/libtest/server_container.cc
+++ b/libtest/server_container.cc
@@ -202,20 +202,14 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t
     {
       if (GEARMAND_BINARY)
       {
-        if (HAVE_LIBGEARMAN)
-        {
-          server= build_gearmand("localhost", try_port);
-        }
+        server= build_gearmand("localhost", try_port);
       }
     }
     else if (server_type.compare("hostile-gearmand") == 0)
     {
       if (GEARMAND_BINARY)
       {
-        if (HAVE_LIBGEARMAN)
-        {
-          server= build_gearmand("localhost", try_port, "gearmand/hostile_gearmand");
-        }
+        server= build_gearmand("localhost", try_port, "gearmand/hostile_gearmand");
       }
     }
     else if (server_type.compare("drizzled") == 0)
@@ -245,10 +239,7 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t
     {
       if (HAVE_MEMCACHED_BINARY)
       {
-        if (HAVE_LIBMEMCACHED)
-        {
-          server= build_memcached("localhost", try_port);
-        }
+        server= build_memcached("localhost", try_port);
       }
     }
 
@@ -294,9 +285,14 @@ bool server_startup_st::start_server(const std::string& server_type, in_port_t t
       {
         if (opt_startup_message)
         {
-          Outn();
-          Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
-          Outn();
+#if defined(DEBUG)
+          if (DEBUG)
+          {
+            Outn();
+            Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+            Outn();
+          }
+#endif
         }
       }
   }
@@ -337,16 +333,9 @@ bool server_startup_st::start_socket_server(const std::string& server_type, cons
     }
     else if (server_type.compare("memcached") == 0)
     {
-      if (MEMCACHED_BINARY)
+      if (HAVE_MEMCACHED_BINARY)
       {
-        if (HAVE_LIBMEMCACHED)
-        {
           server= build_memcached_socket("localhost", try_port);
-        }
-        else
-        {
-          Error << "Libmemcached was not found";
-        }
       }
       else
       {
@@ -397,9 +386,14 @@ bool server_startup_st::start_socket_server(const std::string& server_type, cons
     {
       if (opt_startup_message)
       {
-        Outn();
-        Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
-        Outn();
+#if defined(DEBUG)
+        if (DEBUG)
+        {
+          Outn();
+          Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+          Outn();
+        }
+#endif
       }
     }
   }