*
*/
-#include <config.h>
-#include <libtest/common.h>
+#include "libtest/yatlcon.h"
+
+#include "libtest/common.h"
#include <cassert>
#include <cerrno>
}
else
{
- char port_str[NI_MAXSERV]= { 0 };
- snprintf(port_str, sizeof(port_str), "%u", int(arg->port()));
+ libtest::vchar_t port_str;
+ port_str.resize(NI_MAXSERV);
+ snprintf(&port_str[0], port_str.size(), "%u", int(arg->port()));
server_config_string+= "--server=";
server_config_string+= arg->hostname();
server_config_string+= ":";
- server_config_string+= port_str;
+ server_config_string+= &port_str[0];
server_config_string+= " ";
}
{
if (GEARMAND_BINARY)
{
- if (HAVE_LIBGEARMAN)
- {
- server= build_gearmand("localhost", try_port);
- }
+ server= build_gearmand("localhost", try_port);
}
}
else if (server_type.compare("hostile-gearmand") == 0)
{
if (GEARMAND_BINARY)
{
- if (HAVE_LIBGEARMAN)
- {
- server= build_gearmand("localhost", try_port, "gearmand/hostile_gearmand");
- }
+ server= build_gearmand("localhost", try_port, "gearmand/hostile_gearmand");
}
}
else if (server_type.compare("drizzled") == 0)
}
}
}
- else if (server_type.compare("memcached-sasl") == 0)
- {
- if (MEMCACHED_SASL_BINARY)
- {
- if (HAVE_LIBMEMCACHED)
- {
- server= build_memcached_sasl("localhost", try_port, username(), password());
- }
- }
- }
else if (server_type.compare("memcached") == 0)
{
if (HAVE_MEMCACHED_BINARY)
{
- if (HAVE_LIBMEMCACHED)
- {
- server= build_memcached("localhost", try_port);
- }
- }
- }
- else if (server_type.compare("memcached-light") == 0)
- {
- if (MEMCACHED_LIGHT_BINARY)
- {
- if (HAVE_LIBMEMCACHED)
- {
- server= build_memcached_light("localhost", try_port);
- }
+ server= build_memcached("localhost", try_port);
}
}
{
if (opt_startup_message)
{
- Outn();
- Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
- Outn();
+#if defined(DEBUG)
+ if (DEBUG)
+ {
+ Outn();
+ Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+ Outn();
+ }
+#endif
}
}
}
{
Error << "Socket files are not supported for gearmand yet";
}
- else if (server_type.compare("memcached-sasl") == 0)
- {
- if (MEMCACHED_SASL_BINARY)
- {
- if (HAVE_LIBMEMCACHED)
- {
- server= build_memcached_sasl_socket("localhost", try_port, username(), password());
- }
- else
- {
- Error << "Libmemcached was not found";
- }
- }
- else
- {
- Error << "No memcached binary is available";
- }
- }
else if (server_type.compare("memcached") == 0)
{
- if (MEMCACHED_BINARY)
+ if (HAVE_MEMCACHED_BINARY)
{
- if (HAVE_LIBMEMCACHED)
- {
server= build_memcached_socket("localhost", try_port);
- }
- else
- {
- Error << "Libmemcached was not found";
- }
}
else
{
{
if (opt_startup_message)
{
- Outn();
- Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
- Outn();
+#if defined(DEBUG)
+ if (DEBUG)
+ {
+ Outn();
+ Out << "STARTING SERVER(pid:" << server->pid() << "): " << server->running();
+ Outn();
+ }
+#endif
}
}
}