X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libtest%2Fserver.h;h=10c1d3745befe08fd3ff25852d78aeab9718ba78;hb=330fec7545537270d974f4f2d9cfdc936273d895;hp=f27ce08f7455066598b6ac333b7eef079cdcc1a9;hpb=bf755bec1cd09fad086a47650c1a725c9fbc7eb1;p=awesomized%2Flibmemcached

diff --git a/libtest/server.h b/libtest/server.h
index f27ce08f..10c1d374 100644
--- a/libtest/server.h
+++ b/libtest/server.h
@@ -177,7 +177,8 @@ public:
 
   virtual bool ping()= 0;
 
-  virtual bool build(size_t argc, const char *argv[])= 0;
+  bool init(const char *argv[]);
+  virtual bool build()= 0;
 
   void add_option(const std::string&);
   void add_option(const std::string&, const std::string&);
@@ -204,6 +205,8 @@ public:
     _log_file.clear();
   }
 
+  std::pair<std::string, std::string> output();
+
   pid_t pid() const;
 
   bool has_pid() const;
@@ -223,6 +226,11 @@ public:
     _error= arg;
   }
 
+  void reset_error()
+  {
+    _error.clear();
+  }
+
   virtual bool wait_for_pidfile() const;
 
   bool check_pid(pid_t pid_arg) const
@@ -232,7 +240,7 @@ public:
 
   bool is_socket() const
   {
-    return _hostname[0] == '/';
+    return _is_socket;
   }
 
   const std::string running() const
@@ -260,6 +268,11 @@ public:
     return out_of_ban_killed_;
   }
 
+  void timeout(uint32_t timeout_)
+  {
+    _timeout= timeout_;
+  }
+
 protected:
   bool set_pid_file();
   Options _options;
@@ -276,6 +289,7 @@ private:
   bool args(Application&);
 
   std::string _error;
+  uint32_t _timeout; // This number should be high enough for valgrind startup (which is slow)
 };
 
 std::ostream& operator<<(std::ostream& output, const libtest::Server &arg);