X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached_world.h;h=824aabe751adfa503384f780d83233d404f81db1;hb=refs%2Ftags%2F1.0.4;hp=7936a524826818b009cbbe5e6ac67b7506071203;hpb=afddcf83538afc8300886702fcddf2333eb94c1f;p=awesomized%2Flibmemcached

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 7936a524..824aabe7 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -31,7 +31,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 {
   if (HAVE_MEMCACHED_BINARY == 0)
   {
-    error= TEST_FATAL;
+    error= TEST_SKIPPED;
     return NULL;
   }
 
@@ -48,7 +48,6 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-
   in_port_t max_port= TEST_PORT_BASE;
   for (uint32_t x= 0; x < servers.count(); x++)
   {
@@ -249,7 +248,17 @@ static test_return_t _runner_default(libmemcached_test_callback_fn func, libmemc
   {
     test_true(container);
     test_true(container->memc);
-    return func(container->memc);
+    test_return_t ret;
+    try {
+      ret= func(container->memc);
+    }
+    catch (std::exception& e)
+    {
+      Error << e.what();
+      return TEST_FAILURE;
+    }
+
+    return ret;
   }
 
   return TEST_SUCCESS;