Update framework.

[m6w6/libmemcached] / tests / libmemcached_world.h

diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index cedb8c2fa6e6b8da44428b12a6ae029ea1d4d881..c31b303fa911fae2221670f62fc5847d6fae0eff 100644 (file)
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -39,8 +39,6 @@
 
 #pragma once
 
-#include <cassert>
-
 /* The structure we use for the test system */
 struct libmemcached_test_container_st
 {
@@ -76,21 +74,20 @@ static void *world_create(libtest::server_startup_st& servers, test_return_t& er
     return NULL;
   }
 
-  for (uint32_t x= 0; x < servers.count(); x++)
+  for (uint32_t x= 0; x < servers.servers_to_run(); x++)
   {
     in_port_t port= libtest::get_free_port();
 
-    const char *argv[1]= { "memcached" };
     if (servers.sasl())
     {
-      if (server_startup(servers, "memcached-sasl", port, 1, argv) == false)
+      if (server_startup(servers, "memcached-sasl", port, 0, NULL) == false)
       {
         fatal_message("Could not start memcached-sasl");
       }
     }
     else
     {
-      if (server_startup(servers, "memcached", port, 1, argv) == false)
+      if (server_startup(servers, "memcached", port, 0, NULL) == false)
       {
         fatal_message("Could not start memcached");
       }
@@ -211,64 +208,4 @@ static bool world_destroy(void *object)
 
 typedef test_return_t (*libmemcached_test_callback_fn)(memcached_st *);
 
-static test_return_t _runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
-{
-  if (func)
-  {
-    test_true(container);
-    test_true(container->memc);
-    test_return_t ret;
-    try {
-      ret= func(container->memc);
-    }
-    catch (std::exception& e)
-    {
-      libtest::Error << e.what();
-      return TEST_FAILURE;
-    }
-
-    return ret;
-  }
-
-  return TEST_SUCCESS;
-}
-
-static test_return_t _pre_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
-{
-  if (func)
-  {
-    return func(container->parent);
-  }
-
-  return TEST_SUCCESS;
-}
-
-static test_return_t _post_runner_default(libmemcached_test_callback_fn func, libmemcached_test_container_st *container)
-{
-  if (func)
-  {
-    return func(container->parent);
-  }
-
-  return TEST_SUCCESS;
-}
-
-class LibmemcachedRunner : public libtest::Runner {
-public:
-  test_return_t run(test_callback_fn* func, void *object)
-  {
-    return _runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
-  }
-
-  test_return_t pre(test_callback_fn* func, void *object)
-  {
-    return _pre_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
-  }
-
-  test_return_t post(test_callback_fn* func, void *object)
-  {
-    return _post_runner_default(libmemcached_test_callback_fn(func), (libmemcached_test_container_st*)object);
-  }
-};
-
-static LibmemcachedRunner defualt_libmemcached_runner;
+#include "tests/runner.h"