Fix valgrind issues.

diff --git a/libtest/blobslap_worker.cc b/libtest/blobslap_worker.cc
index d86840580415c773be85fb433b9a30b54b1e5fc9..5bf5f535f38355ae2c43a3d469774863d03cb479 100644 (file)
--- a/libtest/blobslap_worker.cc
+++ b/libtest/blobslap_worker.cc
@@ -127,7 +127,7 @@ public:
     return "--daemon";
   }
 
-  void has_port_option() const
+  bool has_port_option() const
   {
     return true;
   }

diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
index 5b4b64c8ff3692937913f76a7ea2e9be7cf25515..6807c338af6fe20e69efffdff9be152e05ae9b09 100644 (file)
--- a/libtest/cmdline.cc
+++ b/libtest/cmdline.cc
@@ -241,7 +241,6 @@ Application::error_t Application::wait()
   {
     Error << print_argv(built_argv, _argc, _pid);
   }
-  
 
   return exit_code;
 }

diff --git a/libtest/gearmand.cc b/libtest/gearmand.cc
index caa75f651910ea214184c60134aa9c1ce8f27d52..dda38fbdfab3b68ca32437fd8c20320c3fa2cf56 100644 (file)
--- a/libtest/gearmand.cc
+++ b/libtest/gearmand.cc
@@ -195,7 +195,7 @@ public:
     return true;
   }
 
-  void has_port_option() const
+  bool has_port_option() const
   {
     return true;
   }

diff --git a/libtest/server.cc b/libtest/server.cc
index 0fd1bbf366bbce0465d6e03cf37b95a0545e6809..c29d8c4338b9a4c3ed2f565526611827d9a8010e 100644 (file)
--- a/libtest/server.cc
+++ b/libtest/server.cc
@@ -132,7 +132,11 @@ bool Server::start()
     Error << "Could not kill() existing server during start() pid:" << _pid;
     return false;
   }
-  assert(not has_pid());
+
+  if (has_pid() == false)
+  {
+    fatal_message("has_pid() failed, programer error");
+  }
 
   Application app(name(), is_libtool());
   if (args(app) == false)
@@ -141,15 +145,16 @@ bool Server::start()
     return false;
   }
 
-  if (Application::SUCCESS !=  app.run())
+  Application::error_t ret;
+  if (Application::SUCCESS !=  (ret= app.run()))
   {
-    Error << "Application::run()";
+    Error << "Application::run() " << ret;
     return false;
   }
 
-  if (Application::SUCCESS !=  app.wait())
+  if (Application::SUCCESS !=  (ret= app.wait()))
   {
-    Error << "Application::wait()";
+    Error << "Application::wait() " << ret;
     return false;
   }
 

diff --git a/libtest/server_container.cc b/libtest/server_container.cc
index 3c84ad85c339b9e9a7ddfb5021503df1effe2713..244f80e6b4fb7545642132bd36cda7653977a587 100644 (file)
--- a/libtest/server_container.cc
+++ b/libtest/server_container.cc
@@ -144,7 +144,10 @@ bool server_startup_st::is_helgrind() const
 bool server_startup(server_startup_st& construct, const std::string& server_type, in_port_t try_port, int argc, const char *argv[])
 {
   Outn();
-  (void)try_port;
+  if (try_port <= 0)
+  {
+    libtest::fatal(LIBYATL_DEFAULT_PARAM, "was passed the invalid port number %d", int(try_port));
+  }
 
   libtest::Server *server= NULL;
   if (0)

diff --git a/tests/cli.am b/tests/cli.am
index ecc66dda7be1e855294da3c32fe267e4ac29d689..32b87981f7935d4268d780e221fa0e3c6daaf4fb 100644 (file)
--- a/tests/cli.am
+++ b/tests/cli.am
@@ -92,5 +92,8 @@ test-memstat: tests/memstat
 test-memerror: tests/memerror
        tests/memerror
 
-valgrind-memerror: clients/memerror
+valgrind-memerror: tests/memerror
+        @$(VALGRIND_COMMAND) tests/memerror
+
+valgrind-memtouch: tests/memtouch
         @$(VALGRIND_COMMAND) tests/memerror

diff --git a/tests/memtouch.cc b/tests/memtouch.cc
index 426e3c981d88c0ae650539f6f71aec0ed08f34bb..a09bd40a0c8a8eaf92dbcf14f45d36f24560ecb8 100644 (file)
--- a/tests/memtouch.cc
+++ b/tests/memtouch.cc
@@ -65,7 +65,6 @@ static test_return_t touch_test(void *)
 {
   char buffer[1024];
   snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
-  const char *args[]= { "--expire=30", buffer, "foo", 0 };
 
   memcached_st *memc= memcached(buffer, strlen(buffer));
   test_true(memc);
@@ -75,6 +74,8 @@ static test_return_t touch_test(void *)
 
   test_compare(MEMCACHED_SUCCESS, memcached_exist(memc, test_literal_param("foo")));
 
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
+  const char *args[]= { "--expire=30", buffer, "foo", 0 };
   test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
 
   test_compare(MEMCACHED_SUCCESS, memcached_exist(memc, test_literal_param("foo")));
@@ -87,9 +88,8 @@ static test_return_t touch_test(void *)
 static test_return_t NOT_FOUND_test(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
-  const char *args[]= { "--expire=30", buffer, "foo", 0 };
 
+  snprintf(buffer, sizeof(buffer), "--server=localhost:%d", int(default_port()));
   memcached_st *memc= memcached(buffer, strlen(buffer));
   test_true(memc);
 
@@ -97,6 +97,8 @@ static test_return_t NOT_FOUND_test(void *)
 
   test_compare(MEMCACHED_NOTFOUND, memcached_exist(memc, test_literal_param("foo")));
 
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
+  const char *args[]= { "--expire=30", buffer, "foo", 0 };
   test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));
 
   test_compare(MEMCACHED_NOTFOUND, memcached_exist(memc, test_literal_param("foo")));