X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fcycle.cc;h=618994b3ea8ecb722b936e41bf86dcc810533bd6;hb=785f671d065aa12941a98fca384248ac5cd6e527;hp=679473eadd02c823b19dbc98502e5dcddfddee0a;hpb=e9c7a25491f4cf9265a926b7d9848bd70acaf7aa;p=m6w6%2Flibmemcached

diff --git a/tests/cycle.cc b/tests/cycle.cc
index 679473ea..618994b3 100644
--- a/tests/cycle.cc
+++ b/tests/cycle.cc
@@ -39,16 +39,16 @@
   Test that we are cycling the servers we are creating during testing.
 */
 
-#include <config.h>
-#include <libtest/test.hpp>
+#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)
 {
   server_startup_st *servers= (server_startup_st*)obj;
-  test_compare(true, server_startup(*servers, "memcached", libtest::get_free_port(), 0, NULL, false));
+  test_compare(true, server_startup(*servers, "memcached", libtest::get_free_port(), NULL));
   test_compare(true, servers->shutdown());
 
 
@@ -57,10 +57,12 @@ 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++)
+  for (size_t x= 0; x < 10; ++x)
   {
-    test_compare(true, server_startup(*servers, "memcached", libtest::get_free_port(), 0, NULL, false));
+    test_compare(true, server_startup(*servers, "memcached", libtest::get_free_port(), NULL));
   }
   test_compare(true, servers->shutdown());
 
@@ -118,6 +120,12 @@ collection_st collection[] ={
 
 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;
@@ -127,7 +135,7 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
   return &servers;
 }
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   world->collections(collection);
   world->create(world_create);