projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests: fix client test order
[awesomized/libmemcached]
/
libtest
/
server.cc
diff --git
a/libtest/server.cc
b/libtest/server.cc
index 33b20ad89c3b940bde58b2905ab715029a3f54fa..7f3a2d1eda5947444f60a7e23392e893c7642b26 100644
(file)
--- a/
libtest/server.cc
+++ b/
libtest/server.cc
@@
-130,8
+130,7
@@
Server::~Server()
bool Server::check()
{
_app.slurp();
bool Server::check()
{
_app.slurp();
- _app.check();
- return true;
+ return _app.check();
}
bool Server::validate()
}
bool Server::validate()
@@
-173,6
+172,22
@@
bool Server::wait_for_pidfile() const
return wait.successful();
}
return wait.successful();
}
+bool Server::init(const char *argv[])
+{
+ if (argv)
+ {
+ for (const char **ptr= argv; *ptr ; ++ptr)
+ {
+ if (ptr)
+ {
+ add_option(*ptr);
+ }
+ }
+ }
+
+ return build();
+}
+
bool Server::has_pid() const
{
return (_app.pid() > 1);
bool Server::has_pid() const
{
return (_app.pid() > 1);
@@
-181,14
+196,6
@@
bool Server::has_pid() const
bool Server::start()
{
bool Server::start()
{
- // If we find that we already have a pid then kill it.
- if (has_pid() == true)
- {
-#if 0
- fatal_message("has_pid() failed, programer error");
-#endif
- }
-
if (getenv("YATL_GDB_SERVER"))
{
_app.use_gdb(true);
if (getenv("YATL_GDB_SERVER"))
{
_app.use_gdb(true);