Import/Merge of libtest latest.

[m6w6/libmemcached] / libtest / server_container.h

diff --git a/libtest/server_container.h b/libtest/server_container.h
index 0a78c4f5345e94d2b6274ea4028097ce0a9d4ffd..a0287e6d6ee7ffea2164fc72791ec280376612d6 100644 (file)
--- a/libtest/server_container.h
+++ b/libtest/server_container.h
@@ -68,7 +68,8 @@ public:
 
   bool validate();
 
-  bool start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[]);
+  bool start_socket_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message= true);
+  bool start_server(const std::string& server_type, const in_port_t try_port, int argc, const char *argv[], const bool opt_startup_message= true);
 
   uint32_t count() const
   {
@@ -112,13 +113,16 @@ public:
   }
 
 
-  void shutdown_and_remove();
+  // Just remove everything after shutdown
+  void clear();
+
   bool shutdown();
   bool shutdown(uint32_t number_of_host);
 
   bool check() const;
 
   void push_server(Server *);
+  Server* last();
   Server *pop_server();
 
   unsigned long int servers_to_run() const