Merge of build trunk

[m6w6/libmemcached] / tests / memstat.cc

diff --git a/tests/memstat.cc b/tests/memstat.cc
index ec7dd4f88cd6d30de2d2040236367e7ab431a30b..2ffb26bded821fbb126baa4f0bdbf0cba5ed01ca 100644 (file)
--- a/tests/memstat.cc
+++ b/tests/memstat.cc
@@ -70,21 +70,31 @@ static test_return_t help_test(void *)
   return TEST_SUCCESS;
 }
 
-static test_return_t ascii_test(void *)
+static test_return_t binary_TEST(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
-  const char *args[]= { "--quiet", buffer, " -a ", 0 };
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(libtest::default_port()));
+  const char *args[]= { "--quiet", buffer, " --binary ", 0 };
 
   test_true(exec_cmdline(executable, args));
   return TEST_SUCCESS;
 }
 
-static test_return_t binary_test(void *)
+static test_return_t server_version_TEST(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
-  const char *args[]= { "--quiet", buffer, " -b ", 0 };
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(libtest::default_port()));
+  const char *args[]= { "--quiet", buffer, " --server-version", 0 };
+
+  test_true(exec_cmdline(executable, args));
+  return TEST_SUCCESS;
+}
+
+static test_return_t binary_server_version_TEST(void *)
+{
+  char buffer[1024];
+  snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(libtest::default_port()));
+  const char *args[]= { "--quiet", buffer, " --binary --server-version", 0 };
 
   test_true(exec_cmdline(executable, args));
   return TEST_SUCCESS;
@@ -93,8 +103,9 @@ static test_return_t binary_test(void *)
 test_st memstat_tests[] ={
   {"--quiet", 0, quiet_test},
   {"--help", 0, help_test},
-  {"-a, ascii", 0, ascii_test},
-  {"-b, binary", 0, binary_test},
+  {"--binary", 0, binary_TEST},
+  {"--server-version", 0, server_version_TEST},
+  {"--binary --server-version", 0, binary_server_version_TEST},
   {0, 0, 0}
 };
 
@@ -112,7 +123,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
   }
 
   const char *argv[1]= { "memstat" };
-  if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
+  if (server_startup(servers, "memcached", libtest::default_port(), 1, argv) == false)
   {
     error= TEST_FAILURE;
   }