X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fmemcapable.cc;h=63a1d269251266cd6d7d41ca1e2a03e706efd9f2;hb=d9b744aa354952e18e07d6448a4004aa0c7e5802;hp=65db1698fd1ee8cf41606bd897aa310382361615;hpb=3645e647825396693c46a4de5d9e45dfde54dabd;p=awesomized%2Flibmemcached

diff --git a/tests/memcapable.cc b/tests/memcapable.cc
index 65db1698..63a1d269 100644
--- a/tests/memcapable.cc
+++ b/tests/memcapable.cc
@@ -39,10 +39,10 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
@@ -52,38 +52,49 @@ using namespace libtest;
 
 static std::string executable;
 
+static test_return_t quiet_test(void *)
+{
+  const char *args[]= { "-q", 0 };
+
+  test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));
+
+  return TEST_SUCCESS;
+}
+
 static test_return_t help_test(void *)
 {
-  char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
-  const char *args[]= { buffer, "--help", 0 };
+  const char *args[]= { "-h", 0 };
+
+  test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
 
-  test_true(exec_cmdline(executable, args));
   return TEST_SUCCESS;
 }
 
 static test_return_t ascii_test(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
-  const char *args[]= { buffer, " -a ", 0 };
+  snprintf(buffer, sizeof(buffer), "%d", int(default_port()));
+  const char *args[]= { "-p", buffer, "-a", 0 };
+
+  test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
 
-  test_true(exec_cmdline(executable, args));
   return TEST_SUCCESS;
 }
 
 static test_return_t binary_test(void *)
 {
   char buffer[1024];
-  snprintf(buffer, sizeof(buffer), "-p %d", int(default_port()));
-  const char *args[]= { buffer, " -b ", 0 };
+  snprintf(buffer, sizeof(buffer), "%d", int(default_port()));
+  const char *args[]= { "-p", buffer, "-b", 0 };
+
+  test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
 
-  test_true(exec_cmdline(executable, args));
   return TEST_SUCCESS;
 }
 
 test_st memcapable_tests[] ={
-  {"--help", 0, help_test},
+  {"--quiet", 0, quiet_test},
+  {"-h", 0, help_test},
   {"-a, ascii", 0, ascii_test},
   {"-b, binary", 0, binary_test},
   {0, 0, 0}
@@ -96,20 +107,18 @@ collection_st collection[] ={
 
 static void *world_create(server_startup_st& servers, test_return_t& error)
 {
-  const char *argv[1]= { "memcapable" };
-  if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
-  {
-    error= TEST_FAILURE;
-  }
+  SKIP_UNLESS(libtest::has_memcached())
+
+  SKIP_UNLESS(server_startup(servers, "memcached", libtest::default_port(), NULL))
 
   return &servers;
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   executable= "./clients/memcapable";
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }