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 flaky regression_bug_1251482 test
[awesomized/libmemcached]
/
libtest
/
cmdline.h
diff --git
a/libtest/cmdline.h
b/libtest/cmdline.h
index ae4d9ba1d67751f73315277095642842d2d53ed7..368daaecbbbf2e18ab32b4e169ed7a9d429cc20d 100644
(file)
--- a/
libtest/cmdline.h
+++ b/
libtest/cmdline.h
@@
-39,15
+39,20
@@
#include <spawn.h>
// http://www.gnu.org/software/automake/manual/automake.html#Using-the-TAP-test-protocol
#include <spawn.h>
// http://www.gnu.org/software/automake/manual/automake.html#Using-the-TAP-test-protocol
-#define EXIT_SKIP 77
-#define EXIT_FATAL 77
+#ifndef EXIT_SKIP
+# define EXIT_SKIP 77
+#endif
+
+#ifndef EXIT_FATAL
+# define EXIT_FATAL 99
+#endif
#ifndef EX_NOEXEC
#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 {
@@
-145,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;
@@
-162,7
+172,7
@@
public:
std::string print();
std::string print();
- void use_valgrind(bool arg
= true
)
+ void use_valgrind(bool arg)
{
_use_valgrind= arg;
}
{
_use_valgrind= arg;
}
@@
-172,12
+182,12
@@
public:
bool slurp();
void murder();
bool slurp();
void murder();
- void use_gdb(bool arg
= true
)
+ void use_gdb(bool arg)
{
_use_gdb= arg;
}
{
_use_gdb= arg;
}
- void use_ptrcheck(bool arg
= true
)
+ void use_ptrcheck(bool arg)
{
_use_ptrcheck= arg;
}
{
_use_ptrcheck= arg;
}
@@
-202,6
+212,7
@@
public:
private:
void create_argv(const char *args[]);
void delete_argv();
private:
void create_argv(const char *args[]);
void delete_argv();
+ void add_to_build_argv(const char*);
private:
const bool _use_libtool;
private:
const bool _use_libtool;
@@
-234,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();
-
}
}