X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ffailure.cc;h=f572cce6c2b0187c7a49b8ad221a3c10d5090c4d;hb=b0e10bd4ddc74e7018d2370283f3ae6316228cc7;hp=95c8fb6ad8cfb8f482414a8b8d6afeb682547427;hpb=25efe3485198149616820ab4e52d2f18f0abe5a7;p=m6w6%2Flibmemcached

diff --git a/tests/failure.cc b/tests/failure.cc
index 95c8fb6a..f572cce6 100644
--- a/tests/failure.cc
+++ b/tests/failure.cc
@@ -34,7 +34,7 @@
  *
  */
 
-#include <config.h>
+#include <mem_config.h>
 
 /*
   C++ interface test
@@ -59,10 +59,12 @@ using namespace std;
 using namespace memcache;
 using namespace libtest;
 
-Framework *global_framework= NULL;
+libtest::Framework *global_framework= NULL;
 
 static test_return_t shutdown_servers(memcached_st *memc)
 {
+  return TEST_SKIPPED;
+
   test_skip_valgrind();
 
   test_compare(memcached_server_count(memc), 1U);
@@ -75,12 +77,14 @@ static test_return_t shutdown_servers(memcached_st *memc)
 
 static test_return_t add_shutdown_servers(memcached_st *memc)
 {
+  return TEST_SKIPPED;
+
   test_skip_valgrind();
 
   while (memcached_server_count(memc) < 2)
   {
     const char *argv[1]= { "add_shutdown_server" };
-    test_true(global_framework->servers().start_socket_server("memcached", libtest::default_port(), 1, argv));
+    test_true(global_framework->servers().start_socket_server("memcached", libtest::default_port(), argv));
     test_compare(MEMCACHED_SUCCESS, memcached_server_add(memc, "localhost", libtest::default_port()));
   }
 
@@ -98,7 +102,7 @@ static test_return_t restart_servers(memcached_st *)
   return TEST_SUCCESS;
 }
 
-#include "libmemcached/instance.h"
+#include "libmemcached/instance.hpp"
 static test_return_t cull_TEST(memcached_st *memc)
 {
   uint32_t count= memcached_server_count(memc);
@@ -220,7 +224,7 @@ collection_st collection[] ={
 
 #include "tests/libmemcached_world.h"
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
   world->servers().set_servers_to_run(1);