Second pass on update of yatl.

[awesomized/libmemcached] / libtest / memcached.cc

diff --git a/libtest/memcached.cc b/libtest/memcached.cc
index c54c6b9048b68fd7344626b38da16e5f777ee09e..ff246b5a50f27bc1f4be63f304c9aa229a521bee 100644 (file)
--- a/libtest/memcached.cc
+++ b/libtest/memcached.cc
@@ -34,9 +34,9 @@
  *
  */
 
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
 
-#include <libtest/common.h>
+#include "libtest/common.h"
 
 #include <cassert>
 #include <cerrno>
@@ -86,7 +86,7 @@ public:
 
   virtual const char *sasl() const
   {
-    return "-S";
+    return NULL;
   }
 
   const std::string& password() const
@@ -207,7 +207,7 @@ bool Memcached::build(size_t argc, const char *argv[])
   add_option("-M");
 #endif
 
-  if (_username.size())
+  if (sasl())
   {
     add_option(sasl());
   }
@@ -222,23 +222,22 @@ bool Memcached::build(size_t argc, const char *argv[])
 
 libtest::Server *build_memcached(const std::string& hostname, const in_port_t try_port)
 {
-  return new Memcached(hostname, try_port, false);
-}
+  if (HAVE_MEMCACHED_BINARY)
+  {
+    return new Memcached(hostname, try_port, false);
+  }
 
-libtest::Server *build_memcached_socket(const std::string& socket_file, const in_port_t try_port)
-{
-  return new Memcached(socket_file, try_port, true);
+  return NULL;
 }
 
-libtest::Server *build_memcached_sasl(const std::string& hostname, const in_port_t try_port, const std::string& username, const std::string &password)
+libtest::Server *build_memcached_socket(const std::string& socket_file, const in_port_t try_port)
 {
-  if (username.empty())
+  if (HAVE_MEMCACHED_BINARY)
   {
-    return new Memcached(hostname, try_port, false,  "memcached", "memcached");
+    return new Memcached(socket_file, try_port, true);
   }
 
-  return new Memcached(hostname, try_port, false,  username, password);
+  return NULL;
 }
 
 } // namespace libtest
-