From: Brian Aker <brian@tangent.org>
Date: Mon, 13 Aug 2012 07:31:21 +0000 (-0400)
Subject: Fix server_startup to allow for SKIPPED.
X-Git-Tag: 1.0.11~8^2~1
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=7e9077c0ead0394bcfa84a44ebbecf6af1c7bd44;p=m6w6%2Flibmemcached

Fix server_startup to allow for SKIPPED.
---

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index 8bc48a71..5147e1a4 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -70,14 +70,22 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
     {
       if (server_startup(servers, "memcached-sasl", port, 0, NULL) == false)
       {
+        error= TEST_SKIPPED;
+#if 0
         fatal_message("Could not start memcached-sasl");
+#endif
+        return NULL;
       }
     }
     else
     {
       if (server_startup(servers, "memcached", port, 0, NULL) == false)
       {
+        error= TEST_SKIPPED;
+#if 0
         fatal_message("Could not start memcached");
+#endif
+        return NULL;
       }
     }
   }
diff --git a/tests/libmemcached_world_socket.h b/tests/libmemcached_world_socket.h
index fbfb5a9c..a3078e76 100644
--- a/tests/libmemcached_world_socket.h
+++ b/tests/libmemcached_world_socket.h
@@ -56,7 +56,11 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
     const char *argv[1]= { "memcached" };
     if (servers.start_socket_server("memcached", libtest::get_free_port(), 1, argv) == false)
     {
+#if 0
       fatal_message("Could not launch memcached");
+#endif
+      error= TEST_SKIPPED;
+      return NULL;
     }
   }