Sync libtest.

[m6w6/libmemcached] / libtest / cmdline.h

diff --git a/libtest/cmdline.h b/libtest/cmdline.h
index f6da62bea260d02aeae9f1bdddff693cb09588c0..7b0afc5ffc27310374ac7e3457d1c5e7d8df7536 100644 (file)
--- a/libtest/cmdline.h
+++ b/libtest/cmdline.h
@@ -58,6 +58,8 @@ public:
                        posix_spawn_file_actions_t& file_actions,
                        const int newfildes);
 
+    void nonblock();
+
   private:
     int _fd[2];
     bool _open[2];
@@ -70,8 +72,9 @@ public:
 
   void add_option(const std::string&);
   void add_option(const std::string&, const std::string&);
+  void add_long_option(const std::string& option_name, const std::string& option_value);
   error_t run(const char *args[]= NULL);
-  error_t wait();
+  error_t wait(bool nohang= true);
 
   libtest::vchar_t stdout_result() const
   {
@@ -100,6 +103,11 @@ public:
     _use_valgrind= arg;
   }
 
+  bool check() const;
+
+  bool slurp();
+  void murder();
+
   void use_gdb(bool arg= true)
   {
     _use_gdb= arg;
@@ -112,6 +120,11 @@ public:
     return  _gdb_filename;
   }
 
+  pid_t pid() const
+  {
+    return _pid;
+  }
+
 private:
   void create_argv(const char *args[]);
   void delete_argv();