projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-188
[awesomized/libmemcached]
/
libtest
/
gearmand.cc
diff --git
a/libtest/gearmand.cc
b/libtest/gearmand.cc
index 66ab7bdcfe002d06122c47f470f2b025d52c7634..d9dcf19248c719dc84b6b21983f5730d222f9c87 100644
(file)
--- a/
libtest/gearmand.cc
+++ b/
libtest/gearmand.cc
@@
-39,10
+39,6
@@
#include <libtest/gearmand.h>
#include <libtest/gearmand.h>
-#include "util/instance.hpp"
-#include "util/operation.hpp"
-
-using namespace datadifferential;
using namespace libtest;
#include <cassert>
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++)
{
for (size_t x= 0 ; x < argc ; x++)
{
+ if (argv[x] == NULL)
+ {
+ break;
+ }
+
add_option(argv[x]);
}
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 (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
}
#endif
}