Done

libtest/unittest.cc

@@ -270,7 +270,7 @@ static test_return_t drizzled_cycle_test(void *object)
 
   test_skip(true, has_drizzled());
 
-  test_true(server_startup(*servers, "drizzled", get_free_port(), 0, NULL));
+  test_skip(true, server_startup(*servers, "drizzled", get_free_port(), 0, NULL));
 
   return TEST_SUCCESS;
 }
@@ -286,7 +286,7 @@ static test_return_t gearmand_cycle_test(void *object)
 
   test_skip(true, has_gearmand());
 
-  test_true(server_startup(*servers, "gearmand", get_free_port(), 0, NULL));
+  test_skip(true, server_startup(*servers, "gearmand", get_free_port(), 0, NULL));
 
   return TEST_SUCCESS;
 }

tests/blobslap_client.cc

@@ -100,12 +100,12 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 {
   if (server_startup(servers, "gearmand", libtest::default_port(), 0, NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
   }
 
   if (server_startup(servers, "blobslap_worker", libtest::default_port(), 0, NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
   }
 
   return &servers;

tests/cli.cc

@@ -301,7 +301,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 {
   if (server_startup(servers, "gearmand", default_port(), 0, NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
     return NULL;
   }
 

tests/cycle.cc

@@ -94,7 +94,7 @@ static test_return_t kill_test(void *)
 static test_return_t server_startup_single_TEST(void *obj)
 {
   cycle_context_st *context= (cycle_context_st*)obj;
-  test_compare(true, server_startup(context->servers, "gearmand", context->port, 0, NULL, false));
+  test_skip(true, server_startup(context->servers, "gearmand", context->port, 0, NULL, false));
   test_compare(true, context->servers.shutdown());
 
 
@@ -106,7 +106,7 @@ static test_return_t server_startup_multiple_TEST(void *obj)
   cycle_context_st *context= (cycle_context_st*)obj;
   for (size_t x= 0; x < 10; x++)
   {
-    test_compare(true, server_startup(context->servers, "gearmand", context->port, 0, NULL, false));
+    test_skip(true, server_startup(context->servers, "gearmand", context->port, 0, NULL, false));
   }
   test_compare(true, context->servers.shutdown());
 
@@ -145,7 +145,7 @@ static test_return_t collection_INIT(void *object)
   test_zero(context->servers.count());
   context->reset();
 
-  test_compare(true, server_startup(context->servers, "gearmand", context->port, 0, NULL, false));
+  test_skip(true, server_startup(context->servers, "gearmand", context->port, 0, NULL, false));
 
   return TEST_SUCCESS;
 }

tests/drizzle_test.cc

@@ -60,7 +60,7 @@ static test_return_t collection_init(void *object)
   drizzled_port= libtest::get_free_port();
   if (server_startup(test->_servers, "drizzled", drizzled_port, 0, NULL) == false)
   {
-    return TEST_FAILURE;
+    return TEST_SKIPPED;
   }
 #else
   drizzled_port= 0;

tests/httpd_test.cc

@@ -149,7 +149,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
   const char *argv[]= { "--protocol=http", buffer, 0 };
   if (server_startup(servers, "gearmand", libtest::default_port(), 2, argv) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
     return NULL;
   }
 

tests/libgearman-1.0/client_test.cc

@@ -1353,7 +1353,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 {
   if (server_startup(servers, "gearmand", libtest::default_port(), 0, NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
     return NULL;
   }
 

tests/libgearman-1.0/internals.cc

@@ -431,7 +431,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
   */
   if (server_startup(servers, "gearmand", libtest::default_port(), 0, NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
     return NULL;
   }
 

tests/libgearman-1.0/worker_test.cc

@@ -1193,7 +1193,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
 {
   if (server_startup(servers, "gearmand", libtest::default_port(), 0, NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
     return NULL;
   }
 

tests/stress_worker.cc

@@ -442,7 +442,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
   stress_server= libtest::default_port();
   if (server_startup(servers, "gearmand", stress_server, 0, NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
     return NULL;
   }
 
@@ -450,7 +450,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
   hostile_server= libtest::get_free_port();
   if (server_startup(servers, "gearmand", hostile_server, 0, NULL) == false)
   {
-    error= TEST_FAILURE;
+    error= TEST_SKIPPED;
     return NULL;
   }
 #endif