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

[awesomized/libmemcached] / tests / memdump.cc

diff --git a/tests/memdump.cc b/tests/memdump.cc
index 4a30892138cbf7f3dade30185672ccedffeb7918..e34d1b08363cba502bf8be598e6a20775a2141b9 100644 (file)
--- a/tests/memdump.cc
+++ b/tests/memdump.cc
@@ -42,7 +42,7 @@
 #include <config.h>
 
 #include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached-1.0/memcached.h>
 
 using namespace libtest;
 
@@ -67,7 +67,7 @@ static test_return_t server_test(void *)
   snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
   const char *args[]= { buffer, 0 };
 
-  test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+  test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
 
   return TEST_SUCCESS;
 }
@@ -91,7 +91,7 @@ static test_return_t FOUND_test(void *)
   test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
   test_compare(MEMCACHED_SUCCESS, rc);
 
-  test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+  test_true(exec_cmdline(executable, args, true) <= EXIT_FAILURE);
 
   memcached_free(memc);
 
@@ -112,7 +112,7 @@ collection_st collection[] ={
 
 static void *world_create(server_startup_st& servers, test_return_t& error)
 {
-  if (HAVE_MEMCACHED_BINARY == 0)
+  if (libtest::has_memcached() == false)
   {
     error= TEST_SKIPPED;
     return NULL;
@@ -121,15 +121,16 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
   if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
   {
     error= TEST_FAILURE;
+    return NULL;
   }
 
   return &servers;
 }
 
 
-void get_world(Framework *world)
+void get_world(libtest::Framework* world)
 {
-  world->collections= collection;
-  world->_create= world_create;
+  world->collections(collection);
+  world->create(world_create);
 }