X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fmemcached.cc;h=ff246b5a50f27bc1f4be63f304c9aa229a521bee;hb=543d6be67139ee7cb47c0c8e7d383743f4e68857;hp=717ccb698499c550df8824f603d52d456142f2c3;hpb=293e7b59e12ff6b95b5463614b09bc0158f14592;p=awesomized%2Flibmemcached diff --git a/libtest/memcached.cc b/libtest/memcached.cc index 717ccb69..ff246b5a 100644 --- a/libtest/memcached.cc +++ b/libtest/memcached.cc @@ -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 -