tests: run memcached verbosely, catch output and show it on failure

[awesomized/libmemcached] / libtest / cmdline.h

diff --git a/libtest/cmdline.h b/libtest/cmdline.h
index 2f639116e300093bc53f6620945fc467bc2c1a5e..52ced4bfc658463324e21ce34a3ae2eeec2b109f 100644 (file)
--- a/libtest/cmdline.h
+++ b/libtest/cmdline.h
@@ -48,11 +48,11 @@
 #endif
 
 #ifndef EX_NOEXEC
-#  define EX_NOEXEC 126
+# define EX_NOEXEC 126
 #endif
 
 #ifndef EX_NOTFOUND
-#  define EX_NOTFOUND 127
+# define EX_NOTFOUND 127
 #endif
 
 namespace libtest {
@@ -150,6 +150,11 @@ public:
     return _stdout_buffer.size();
   }
 
+  const char* stdout_c_str() const
+  {
+    return &_stdout_buffer[0];
+  }
+
   libtest::vchar_t stderr_result() const
   {
     return _stderr_buffer;
@@ -177,6 +182,13 @@ public:
   bool slurp();
   void murder();
 
+  void clear()
+  {
+    slurp();
+    _stdout_buffer.clear();
+    _stderr_buffer.clear();
+  }
+
   void use_gdb(bool arg)
   {
     _use_gdb= arg;
@@ -240,7 +252,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);
 
-const char *gearmand_binary(); 
-const char *drizzled_binary();
-
 }