Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-183

[awesomized/libmemcached] / tests / cycle.cc

diff --git a/tests/cycle.cc b/tests/cycle.cc
index cfaccb7ed8188899af6207477218d2c93d2f7ec5..a8ddc8a6fa2acf8cec73ac594aa8600403ed41cd 100644 (file)
--- a/tests/cycle.cc
+++ b/tests/cycle.cc
@@ -39,7 +39,7 @@
   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;
@@ -120,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;