X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmemcached.cc;h=7af26092c650a12be452f1af98ead09b1cba971f;hb=5dcfd8799e2ab7d60b8d3b352474d43556d37dcf;hp=ff246b5a50f27bc1f4be63f304c9aa229a521bee;hpb=543d6be67139ee7cb47c0c8e7d383743f4e68857;p=awesomized%2Flibmemcached

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index ff246b5a..7af26092 100644
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -72,14 +72,14 @@ public:
             const std::string& username_arg,
             const std::string& password_arg) :
     libtest::Server(host_arg, port_arg, 
-                    MEMCACHED_BINARY, false, is_socket_arg),
+                    memcached_binary(), false, is_socket_arg),
     _username(username_arg),
     _password(password_arg)
   { }
 
   Memcached(const std::string& host_arg, const in_port_t port_arg, const bool is_socket_arg) :
     libtest::Server(host_arg, port_arg,
-                    MEMCACHED_BINARY, false, is_socket_arg)
+                    memcached_binary(), false, is_socket_arg)
   {
     set_pid_file();
   }
@@ -131,7 +131,7 @@ public:
 
   const char *executable()
   {
-    return MEMCACHED_BINARY;
+    return memcached_binary();
   }
 
   bool is_libtool()
@@ -156,7 +156,8 @@ public:
   {
     char buffer[30];
     snprintf(buffer, sizeof(buffer), "%d", int(arg));
-    app.add_option("-p", buffer); 
+    app.add_option("-p", buffer);
+    app.add_option("-U", buffer);
   }
 
   bool has_port_option() const
@@ -188,13 +189,13 @@ public:
     return true;
   }
 
-  bool build(size_t argc, const char *argv[]);
+  bool build();
 };
 
 
 #include <sstream>
 
-bool Memcached::build(size_t argc, const char *argv[])
+bool Memcached::build()
 {
   if (getuid() == 0 or geteuid() == 0)
   {
@@ -202,7 +203,8 @@ bool Memcached::build(size_t argc, const char *argv[])
   }
 
   add_option("-l", "localhost");
-#ifndef TARGET_OS_OSX
+#ifdef __APPLE__
+#else
   add_option("-m", "128");
   add_option("-M");
 #endif
@@ -212,17 +214,14 @@ bool Memcached::build(size_t argc, const char *argv[])
     add_option(sasl());
   }
 
-  for (size_t x= 0 ; x < argc ; x++)
-  {
-    add_option(argv[x]);
-  }
+  add_option("-vv");
 
   return true;
 }
 
 libtest::Server *build_memcached(const std::string& hostname, const in_port_t try_port)
 {
-  if (HAVE_MEMCACHED_BINARY)
+  if (has_memcached())
   {
     return new Memcached(hostname, try_port, false);
   }
@@ -232,7 +231,7 @@ libtest::Server *build_memcached(const std::string& hostname, const in_port_t tr
 
 libtest::Server *build_memcached_socket(const std::string& socket_file, const in_port_t try_port)
 {
-  if (HAVE_MEMCACHED_BINARY)
+  if (has_memcached())
   {
     return new Memcached(socket_file, try_port, true);
   }