Merge.

[m6w6/libmemcached] / libtest / server.h

diff --git a/libtest/server.h b/libtest/server.h
index 123d1c3255f6d85af7b9b4ee2b26ef35c3b55099..b50b0b2e6fe516a125b679a614e2e14eba9af19c 100644 (file)
--- a/libtest/server.h
+++ b/libtest/server.h
@@ -124,6 +124,11 @@ public:
     return (_port != 0);
   }
 
+  virtual bool has_syslog() const
+  {
+    return false;
+  }
+
   // Reset a server if another process has killed the server
   void reset()
   {
@@ -148,6 +153,8 @@ public:
     return (_pid > 1);
   }
 
+  bool wait_for_pidfile() const;
+
   bool check_pid(pid_t pid_arg) const
   {
     return (pid_arg > 1);
@@ -170,7 +177,6 @@ public:
   bool command(std::string& command_arg);
 
 protected:
-  void nap();
   bool set_pid_file();
 
 private: