tests: fix #77

[awesomized/libmemcached] / libtest / gearmand.cc

diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc
index 41a73d3c38bd96cffcfd1587c04e7905813f02f7..852cf19496e829c88cbbc311378d876f97507434 100644 (file)
--- a/libtest/gearmand.cc
+++ b/libtest/gearmand.cc
@@ -34,15 +34,11 @@
  *
  */
 
-#include "mem_config.h"
+#include "libtest/yatlcon.h"
 #include <libtest/common.h>
 
 #include <libtest/gearmand.h>
 
-#include "util/instance.hpp"
-#include "util/operation.hpp"
-
-using namespace datadifferential;
 using namespace libtest;
 
 #include <cassert>
@@ -67,10 +63,12 @@ class Gearmand : public libtest::Server
 {
 private:
 public:
-  Gearmand(const std::string& host_arg, in_port_t port_arg, const char* binary= GEARMAND_BINARY);
+  Gearmand(const std::string& host_arg, in_port_t port_arg, bool libtool_, const char* binary);
 
   bool ping()
   {
+    reset_error();
+
     if (out_of_ban_killed())
     {
       return false;
@@ -79,7 +77,14 @@ public:
     SimpleClient client(_hostname, _port);
 
     std::string response;
-    return client.send_message("version", response);
+    bool ret= client.send_message("version", response);
+
+    if (client.is_error())
+    {
+      error(client.error());
+    }
+
+    return ret;
   }
 
   const char *name()
@@ -118,16 +123,16 @@ public:
     return true;
   }
 
-  bool build(size_t argc, const char *argv[]);
+  bool build();
 };
 
-Gearmand::Gearmand(const std::string& host_arg, in_port_t port_arg, const char* binary_arg) :
-  libtest::Server(host_arg, port_arg, binary_arg, true)
+Gearmand::Gearmand(const std::string& host_arg, in_port_t port_arg, bool libtool_, const char* binary_arg) :
+  libtest::Server(host_arg, port_arg, binary_arg, libtool_)
 {
   set_pid_file();
 }
 
-bool Gearmand::build(size_t argc, const char *argv[])
+bool Gearmand::build()
 {
   if (getuid() == 0 or geteuid() == 0)
   {
@@ -136,24 +141,38 @@ bool Gearmand::build(size_t argc, const char *argv[])
 
   add_option("--listen=localhost");
 
-  for (size_t x= 0 ; x < argc ; x++)
-  {
-    add_option(argv[x]);
-  }
-
   return true;
 }
 
 namespace libtest {
 
-libtest::Server *build_gearmand(const char *hostname, in_port_t try_port)
-{
-  return new Gearmand(hostname, try_port);
-}
-
 libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const char* binary)
 {
-  return new Gearmand(hostname, try_port, binary);
+  if (binary == NULL)
+  {
+#if defined(HAVE_GEARMAND_BINARY)
+# if defined(GEARMAND_BINARY)
+    if (HAVE_GEARMAND_BINARY)
+    {
+      binary= GEARMAND_BINARY;
+    }
+# endif
+#endif
+  }
+
+  if (binary == NULL)
+  {
+    return NULL;
+  }
+
+  bool is_libtool_script= true;
+
+  if (binary[0] == '/')
+  {
+    is_libtool_script= false;
+  }
+
+  return new Gearmand(hostname, try_port, is_libtool_script, binary);
 }
 
 }