Cleanup memdump's world_create

diff --git a/tests/cli.am b/tests/cli.am
index df206e5cd4472505224838d7183e46ad24b61cd7..1bb9a6a9dcf187f5835644c356a1e8a7f53dab29 100644 (file)
--- a/tests/cli.am
+++ b/tests/cli.am
@@ -122,3 +122,12 @@ valgrind-memerror: tests/memerror
 
 valgrind-memtouch: tests/memtouch
         @$(VALGRIND_COMMAND) tests/memtouch
+
+test-memdump: tests/memdump
+       tests/memdump
+
+gdb-memdump: tests/memdump
+       @$(GDB_COMMAND) tests/memdump
+
+valgrind-memdump: tests/memdump
+        @$(VALGRIND_COMMAND) tests/memdump

diff --git a/tests/memdump.cc b/tests/memdump.cc
index 2a5023712f478461efe7b5d6471e1cf2c618ec3b..ab59c3ce245a594a535fb83dd44e7ae22e0216ca 100644 (file)
--- a/tests/memdump.cc
+++ b/tests/memdump.cc
@@ -111,19 +111,11 @@ collection_st collection[] ={
   {0, 0, 0, 0}
 };
 
-static void *world_create(server_startup_st& servers, test_return_t& error)
+static void *world_create(server_startup_st& servers, test_return_t&)
 {
-  if (libtest::has_memcached() == false)
-  {
-    error= TEST_SKIPPED;
-    return NULL;
-  }
-
-  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
-  {
-    error= TEST_FAILURE;
-    return NULL;
-  }
+  SKIP_UNLESS(libtest::has_memcached());
+
+  ASSERT_TRUE(server_startup(servers, "memcached", libtest::default_port(), NULL));
 
   return &servers;
 }