projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Second pass on update of yatl.
[awesomized/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index b59dc22fa03c7efed4658828aad5a1dc410b5b96..ff246b5a50f27bc1f4be63f304c9aa229a521bee 100644
(file)
--- a/
libtest/memcached.cc
+++ b/
libtest/memcached.cc
@@
-34,12
+34,9
@@
*
*/
*
*/
-#include "
mem_config
.h"
+#include "
libtest/yatlcon
.h"
-#include <libtest/common.h>
-
-#include <libmemcached-1.0/memcached.h>
-#include <libmemcachedutil-1.0/util.h>
+#include "libtest/common.h"
#include <cassert>
#include <cerrno>
#include <cassert>
#include <cerrno>
@@
-225,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)
{
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_s
asl(const std::string& hostname, const in_port_t try_port, const std::string& username, const std::string &password
)
+libtest::Server *build_memcached_s
ocket(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
}
} // namespace libtest
-