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
/
cmdline.cc
diff --git
a/libtest/cmdline.cc
b/libtest/cmdline.cc
index de7c89d70891e287e3aebb3e5bb366bdf469bce4..6b8205cb1fff276fe8d02ccb172fd123e4329541 100644
(file)
--- a/
libtest/cmdline.cc
+++ b/
libtest/cmdline.cc
@@
-113,6
+113,7
@@
Application::Application(const std::string& arg, const bool _use_libtool_arg) :
_use_valgrind(false),
_use_gdb(false),
_use_ptrcheck(false),
_use_valgrind(false),
_use_gdb(false),
_use_ptrcheck(false),
+ _will_fail(false),
_argc(0),
_exectuble(arg),
stdin_fd(STDIN_FILENO),
_argc(0),
_exectuble(arg),
stdin_fd(STDIN_FILENO),
@@
-252,7
+253,10
@@
Application::error_t Application::run(const char *args[])
if (spawn_ret != 0)
{
if (spawn_ret != 0)
{
- Error << strerror(spawn_ret) << "(" << spawn_ret << ")";
+ if (_will_fail == false)
+ {
+ Error << strerror(spawn_ret) << "(" << spawn_ret << ")";
+ }
_pid= -1;
return Application::INVALID;
}
_pid= -1;
return Application::INVALID;
}
@@
-792,4
+796,9
@@
const char *gearmand_binary()
return GEARMAND_BINARY;
}
return GEARMAND_BINARY;
}
+const char *drizzled_binary()
+{
+ return DRIZZLED_BINARY;
+}
+
} // namespace exec_cmdline
} // namespace exec_cmdline