projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
m4: merge TangentOrg/ddm4
[m6w6/libmemcached]
/
libtest
/
cmdline.h
diff --git
a/libtest/cmdline.h
b/libtest/cmdline.h
index d150ff59096654d4d0ba99c73d2272ff8e8021bd..368daaecbbbf2e18ab32b4e169ed7a9d429cc20d 100644
(file)
--- a/
libtest/cmdline.h
+++ b/
libtest/cmdline.h
@@
-36,13
+36,7
@@
#pragma once
#pragma once
-#ifdef _WIN32
-typedef int posix_spawn_file_actions_t;
-#else
-# include <spawn.h>
-#endif
-
-#include <pthread.h>
+#include <spawn.h>
// http://www.gnu.org/software/automake/manual/automake.html#Using-the-TAP-test-protocol
#ifndef EXIT_SKIP
// http://www.gnu.org/software/automake/manual/automake.html#Using-the-TAP-test-protocol
#ifndef EXIT_SKIP
@@
-54,11
+48,11
@@
typedef int posix_spawn_file_actions_t;
#endif
#ifndef EX_NOEXEC
#endif
#ifndef EX_NOEXEC
-#
define EX_NOEXEC 126
+# define EX_NOEXEC 126
#endif
#ifndef EX_NOTFOUND
#endif
#ifndef EX_NOTFOUND
-#
define EX_NOTFOUND 127
+# define EX_NOTFOUND 127
#endif
namespace libtest {
#endif
namespace libtest {
@@
-156,6
+150,11
@@
public:
return _stdout_buffer.size();
}
return _stdout_buffer.size();
}
+ const char* stdout_c_str() const
+ {
+ return &_stdout_buffer[0];
+ }
+
libtest::vchar_t stderr_result() const
{
return _stderr_buffer;
libtest::vchar_t stderr_result() const
{
return _stderr_buffer;
@@
-246,7
+245,4
@@
static inline std::ostream& operator<<(std::ostream& output, const enum Applicat
int exec_cmdline(const std::string& executable, const char *args[], bool use_libtool= false);
int exec_cmdline(const std::string& executable, const char *args[], bool use_libtool= false);
-const char *gearmand_binary();
-const char *drizzled_binary();
-
}
}