projects
/
m6w6
/
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-1.0-115
[m6w6/libmemcached]
/
libtest
/
cmdline.cc
diff --git
a/libtest/cmdline.cc
b/libtest/cmdline.cc
index d4dd970b9ebf47e0694ee2cb484b492bac5fd4bc..97eddd07aa6463497a9a419374412c25e8e6818f 100644
(file)
--- a/
libtest/cmdline.cc
+++ b/
libtest/cmdline.cc
@@
-34,8
+34,8
@@
*
*/
*
*/
-#include
<config.h>
-#include
<libtest/common.h>
+#include
"mem_config.h"
+#include
"libtest/common.h"
using namespace libtest;
using namespace libtest;
@@
-45,8
+45,12
@@
using namespace libtest;
#include <fcntl.h>
#include <fstream>
#include <memory>
#include <fcntl.h>
#include <fstream>
#include <memory>
-#include <poll.h>
-#include <spawn.h>
+#ifdef HAVE_POLL_H
+# include <poll.h>
+#endif
+#ifdef HAVE_SPAWN_H
+# include <spawn.h>
+#endif
#include <sstream>
#include <string>
#include <sys/stat.h>
#include <sstream>
#include <string>
#include <sys/stat.h>
@@
-424,7
+428,6
@@
Application::error_t Application::join()
}
else if WIFSIGNALED(_status)
{
}
else if WIFSIGNALED(_status)
{
- // memcached will die with SIGHUP
if (WTERMSIG(_status) != SIGTERM and WTERMSIG(_status) != SIGHUP)
{
_app_exit_state= Application::INVALID_POSIX_SPAWN;
if (WTERMSIG(_status) != SIGTERM and WTERMSIG(_status) != SIGHUP)
{
_app_exit_state= Application::INVALID_POSIX_SPAWN;
@@
-434,8
+437,8
@@
Application::error_t Application::join()
throw std::runtime_error(error_string);
}
throw std::runtime_error(error_string);
}
- _app_exit_state= Application::SIGTERM_KILLED;
-
Error
<< "waitpid() application terminated at request"
+ // If we terminted it on purpose then it counts as a success.
+
Out
<< "waitpid() application terminated at request"
<< " pid:" << _pid
<< " name:" << built_argv[0];
}
<< " pid:" << _pid
<< " name:" << built_argv[0];
}