X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemdump.cc;h=ab59c3ce245a594a535fb83dd44e7ae22e0216ca;hb=52549085a3f42554cf40c63d4f0d20ec7170a46a;hp=2a5023712f478461efe7b5d6471e1cf2c618ec3b;hpb=0e40facad567ea11474b62f597c34faeea5c86fe;p=awesomized%2Flibmemcached

diff --git a/tests/memdump.cc b/tests/memdump.cc
index 2a502371..ab59c3ce 100644
--- 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;
 }