projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
configure: fix compiler detection
[awesomized/libmemcached]
/
libtest
/
memcached.cc
diff --git
a/libtest/memcached.cc
b/libtest/memcached.cc
index 24bc3b8d18352da7d19656678e1cd6ef79d62a57..e35166205599cf830d35780e44aa072fddf11869 100644
(file)
--- 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,
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,
_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();
}
{
set_pid_file();
}
@@
-131,7
+131,7
@@
public:
const char *executable()
{
const char *executable()
{
- return
MEMCACHED_BINARY
;
+ return
memcached_binary()
;
}
bool is_libtool()
}
bool is_libtool()
@@
-156,7
+156,8
@@
public:
{
char buffer[30];
snprintf(buffer, sizeof(buffer), "%d", int(arg));
{
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
}
bool has_port_option() const
@@
-218,7
+219,7
@@
bool Memcached::build()
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)
{
- if (
HAVE_MEMCACHED_BINARY
)
+ if (
has_memcached()
)
{
return new Memcached(hostname, try_port, false);
}
{
return new Memcached(hostname, try_port, false);
}
@@
-228,7
+229,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)
{
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);
}
{
return new Memcached(socket_file, try_port, true);
}