X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fcycle.cc;h=a8ddc8a6fa2acf8cec73ac594aa8600403ed41cd;hb=195a733bb0bb3d989abfd1c828f25e8c309cbb7b;hp=fe4ca1b37016180dc860924f7f37bd2dea28ee74;hpb=cf55f693c7fc7693afbb4594d97d23795cf7f2a0;p=m6w6%2Flibmemcached

diff --git a/tests/cycle.cc b/tests/cycle.cc
index fe4ca1b3..a8ddc8a6 100644
--- a/tests/cycle.cc
+++ b/tests/cycle.cc
@@ -39,11 +39,11 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
+#include <mem_config.h>
 #include <libtest/test.hpp>
 
 using namespace libtest;
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 static test_return_t server_startup_single_TEST(void *obj)
 {
@@ -57,6 +57,8 @@ static test_return_t server_startup_single_TEST(void *obj)
 
 static test_return_t server_startup_multiple_TEST(void *obj)
 {
+  test_skip(true, jenkins_is_caller());
+
   server_startup_st *servers= (server_startup_st*)obj;
   for (size_t x= 0; x < 10; x++)
   {
@@ -116,12 +118,24 @@ collection_st collection[] ={
   {0, 0, 0, 0}
 };
 
-static void *world_create(server_startup_st& servers, test_return_t& )
+static void *world_create(server_startup_st& servers, test_return_t& error)
 {
+  if (jenkins_is_caller())
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
+  if (libtest::has_memcached() == false)
+  {
+    error= TEST_SKIPPED;
+    return NULL;
+  }
+
   return &servers;
 }
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   world->collections(collection);
   world->create(world_create);