libtest: fix #40 (use nullptr instead of NULL)

[awesomized/libmemcached] / libtest / server.h

diff --git a/libtest/server.h b/libtest/server.h
index 5b26fcddde2f1e10b9a005ee0917f63647650179..10c1d3745befe08fd3ff25852d78aeab9718ba78 100644 (file)
--- a/libtest/server.h
+++ b/libtest/server.h
@@ -41,10 +41,8 @@
 #include <cassert>
 #include <cstdio>
 #include <cstring>
-
 #include <netdb.h>
 #include <netinet/in.h>
-
 #include <string>
 #include <unistd.h>
 #include <vector>
@@ -179,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&);
@@ -206,6 +205,8 @@ public:
     _log_file.clear();
   }
 
+  std::pair<std::string, std::string> output();
+
   pid_t pid() const;
 
   bool has_pid() const;
@@ -251,7 +252,7 @@ public:
 
   std::string log_and_pid();
 
-  bool murder();
+  bool kill();
   bool start();
   bool command(libtest::Application& app);