X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fgearmand.cc;h=d9dcf19248c719dc84b6b21983f5730d222f9c87;hb=17690735658d7b44f91579df91e31da9ae185158;hp=66ab7bdcfe002d06122c47f470f2b025d52c7634;hpb=97b73d47e6a3d5729ba13304ff355a737a34f1b4;p=awesomized%2Flibmemcached

diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc
index 66ab7bdc..d9dcf192 100644
--- a/libtest/gearmand.cc
+++ b/libtest/gearmand.cc
@@ -39,10 +39,6 @@
 
 #include <libtest/gearmand.h>
 
-#include "util/instance.hpp"
-#include "util/operation.hpp"
-
-using namespace datadifferential;
 using namespace libtest;
 
 #include <cassert>
@@ -147,6 +143,11 @@ bool Gearmand::build(size_t argc, const char *argv[])
 
   for (size_t x= 0 ; x < argc ; x++)
   {
+    if (argv[x] == NULL)
+    {
+      break;
+    }
+
     add_option(argv[x]);
   }
 
@@ -159,8 +160,13 @@ libtest::Server *build_gearmand(const char *hostname, in_port_t try_port, const
 {
   if (binary == NULL)
   {
-#if defined(GEARMAND_BINARY)
-    binary= GEARMAND_BINARY;
+#if defined(HAVE_GEARMAND_BINARY)
+# if defined(GEARMAND_BINARY)
+    if (HAVE_GEARMAND_BINARY)
+    {
+      binary= GEARMAND_BINARY;
+    }
+# endif
 #endif
   }