projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge working tree with build tree.
[m6w6/libmemcached]
/
libtest
/
binaries.cc
diff --git
a/libtest/binaries.cc
b/libtest/binaries.cc
index 00a897660f5dbc2ae421d4f776467441e9a9b20d..e437f96942cdc285232f992b6fca986134073b34 100644
(file)
--- a/
libtest/binaries.cc
+++ b/
libtest/binaries.cc
@@
-20,6
+20,7
@@
*/
*/
+#include <config.h>
#include <libtest/common.h>
namespace libtest {
#include <libtest/common.h>
namespace libtest {
@@
-27,7
+28,16
@@
namespace libtest {
bool has_gearmand_binary()
{
#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
bool has_gearmand_binary()
{
#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
- if (access(GEARMAND_BINARY,R_OK|X_OK) == 0)
+ std::stringstream arg_buffer;
+
+ if (getenv("PWD"))
+ {
+ arg_buffer << getenv("PWD");
+ arg_buffer << "/";
+ }
+ arg_buffer << GEARMAND_BINARY;
+
+ if (access(arg_buffer.str().c_str() ,R_OK|X_OK) == 0)
{
return true;
}
{
return true;
}