X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fmemdump.cc;h=a43a61240a0be4915d4de52219402415c24255f0;hb=5db4ece0e8254a205d10e8fda842120a001c17c8;hp=840c1a17fd63d6e078d7db1b4c576d702e866b89;hpb=8cf5f36e16ecaf6e1e7622a3a7cad81491602b0d;p=awesomized%2Flibmemcached

diff --git a/tests/memdump.cc b/tests/memdump.cc
index 840c1a17..a43a6124 100644
--- a/tests/memdump.cc
+++ b/tests/memdump.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>
 #include <libmemcached-1.0/memcached.h>
@@ -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);
 
@@ -118,9 +118,10 @@ static void *world_create(server_startup_st& servers, test_return_t& error)
     return NULL;
   }
 
-  if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
+  if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
   {
     error= TEST_FAILURE;
+    return NULL;
   }
 
   return &servers;