X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ftest.c;h=215218c5f068e5a3f9bfc26c26a419d03bf9cd72;hb=8984944bbc4a973dd26ea48120240ef86698266d;hp=4e5369d6741b85dbb4e9b65c17dd122c80183de5;hpb=271ee75d2e4206ad7f22493a8fb9f65673a9ecf5;p=m6w6%2Flibmemcached

diff --git a/tests/test.c b/tests/test.c
index 4e5369d6..215218c5 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -1,829 +1,370 @@
+/* uTest
+ * Copyright (C) 2006-2009 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ */
+
 /*
   Sample test application.
 */
+
+#include "config.h"
+
 #include <assert.h>
-#include <memcached.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <time.h>
+#include <fnmatch.h>
+#include <stdint.h>
+
+#include "libmemcached/memcached.h"
+#include "test.h"
+
+static void world_stats_print(world_stats_st *stats)
+{
+  fputc('\n', stderr);
+  fprintf(stderr, "Total Collections\t\t\t\t%u\n", stats->collection_total);
+  fprintf(stderr, "\tFailed Collections\t\t\t%u\n", stats->collection_failed);
+  fprintf(stderr, "\tSkipped Collections\t\t\t%u\n", stats->collection_skipped);
+  fprintf(stderr, "\tSucceeded Collections\t\t%u\n", stats->collection_success);
+  fputc('\n', stderr);
+  fprintf(stderr, "Total\t\t\t\t%u\n", stats->total);
+  fprintf(stderr, "\tFailed\t\t\t%u\n", stats->failed);
+  fprintf(stderr, "\tSkipped\t\t\t%u\n", stats->skipped);
+  fprintf(stderr, "\tSucceeded\t\t%u\n", stats->success);
+}
 
 long int timedif(struct timeval a, struct timeval b)
 {
-  register int us, s;
+  long us, s;
 
-  us = a.tv_usec - b.tv_usec;
+  us = (int)(a.tv_usec - b.tv_usec);
   us /= 1000;
-  s = a.tv_sec - b.tv_sec;
+  s = (int)(a.tv_sec - b.tv_sec);
   s *= 1000;
   return s + us;
 }
 
-void init_test(memcached_st *not_used)
-{
-  memcached_st memc;
-
-  (void)memcached_create(&memc);
-  memcached_free(&memc);
-}
-
-void allocation_test(memcached_st *not_used)
-{
-  memcached_st *memc;
-  memc= memcached_create(NULL);
-  assert(memc);
-  memcached_free(memc);
-}
-
-void connection_test(memcached_st *memc)
-{
-  memcached_return rc;
-
-  rc= memcached_server_add(memc, "localhost", 0);
-  assert(rc == MEMCACHED_SUCCESS);
-}
-
-void error_test(memcached_st *memc)
+const char *test_strerror(test_return_t code)
 {
-  memcached_return rc;
-
-  for (rc= MEMCACHED_SUCCESS; rc < MEMCACHED_MAXIMUM_RETURN; rc++)
-  {
-    printf("Error %d -> %s\n", rc, memcached_strerror(memc, rc));
+  switch (code) {
+  case TEST_SUCCESS:
+    return "ok";
+  case TEST_FAILURE:
+    return "failed";
+  case TEST_MEMORY_ALLOCATION_FAILURE:
+    return "memory allocation";
+  case TEST_SKIPPED:
+    return "skipped";
+  case TEST_MAXIMUM_RETURN:
+  default:
+    fprintf(stderr, "Unknown return value\n");
+    abort();
   }
 }
 
-void set_test(memcached_st *memc)
+void create_core(void)
 {
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "when we sanitize";
-
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-}
-
-void add_test(memcached_st *memc)
-{
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "when we sanitize";
-
-  rc= memcached_add(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_NOTSTORED);
-}
-
-void replace_test(memcached_st *memc)
-{
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "when we sanitize";
-
-  rc= memcached_replace(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-}
-
-void delete_test(memcached_st *memc)
-{
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "when we sanitize";
-
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  rc= memcached_delete(memc, key, strlen(key), (time_t)0);
-  WATCHPOINT_ERROR(rc);
-  assert(rc == MEMCACHED_SUCCESS);
-}
-
-void flush_test(memcached_st *memc)
-{
-  memcached_return rc;
-
-  rc= memcached_flush(memc, 0);
-  assert(rc == MEMCACHED_SUCCESS);
-}
+  if (getenv("LIBMEMCACHED_NO_COREDUMP") == NULL)
+  {
+    pid_t pid= fork();
 
-void get_test(memcached_st *memc)
-{
-  memcached_return rc;
-  char *key= "foo";
-  char *string;
-  size_t string_length;
-  uint16_t flags;
-
-  string= memcached_get(memc, key, strlen(key),
-                        &string_length, &flags, &rc);
-
-  assert(rc == MEMCACHED_NOTFOUND);
-  assert(string_length ==  0);
-  assert(!string);
+    if (pid == 0)
+    {
+      abort();
+    }
+    else
+    {
+      while (waitpid(pid, NULL, 0) != pid)
+      {
+        ;
+      }
+    }
+  }
 }
 
-void get_test2(memcached_st *memc)
-{
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "when we sanitize";
-  char *string;
-  size_t string_length;
-  uint16_t flags;
-
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  string= memcached_get(memc, key, strlen(key),
-                        &string_length, &flags, &rc);
-
-  assert(string);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(string_length == strlen(value));
-  assert(!memcmp(string, value, string_length));
-
-  free(string);
-}
 
-void set_test2(memcached_st *memc)
+static test_return_t _runner_default(test_callback_fn func, void *p)
 {
-  memcached_return rc;
-  char *key= "foo";
-  char *value= "train in the brain";
-  size_t value_length= strlen(value);
-  unsigned int x;
-
-  for (x= 0; x < 10; x++)
+  if (func)
   {
-    rc= memcached_set(memc, key, strlen(key), 
-                      value, value_length,
-                      (time_t)0, (uint16_t)0);
-    assert(rc == MEMCACHED_SUCCESS);
+    return func(p);
   }
-}
-
-void set_test3(memcached_st *memc)
-{
-  memcached_return rc;
-  char *key= "foo";
-  char *value;
-  size_t value_length= 8191;
-  unsigned int x;
-
-  value = (char*)malloc(value_length);
-  assert(value);
-
-  for (x= 0; x < value_length; x++)
-    value[x] = (char) (x % 127);
-
-  for (x= 0; x < 1; x++)
+  else
   {
-    rc= memcached_set(memc, key, strlen(key), 
-                      value, value_length,
-                      (time_t)0, (uint16_t)0);
-    assert(rc == MEMCACHED_SUCCESS);
+    return TEST_SUCCESS;
   }
-
-  free(value);
 }
 
-void get_test3(memcached_st *memc)
+static world_runner_st defualt_runners= {
+  _runner_default,
+  _runner_default,
+  _runner_default
+};
+
+static test_return_t _default_callback(void *p)
 {
-  memcached_return rc;
-  char *key= "foo";
-  char *value;
-  size_t value_length= 8191;
-  char *string;
-  size_t string_length;
-  uint16_t flags;
-  int x;
-
-  value = (char*)malloc(value_length);
-  assert(value);
-
-  for (x= 0; x < value_length; x++)
-    value[x] = (char) (x % 127);
-
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, value_length,
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  string= memcached_get(memc, key, strlen(key),
-                        &string_length, &flags, &rc);
-
-  WATCHPOINT_ERRNO(memc->my_errno);
-  WATCHPOINT_ERROR(rc);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(string);
-  assert(string_length == value_length);
-  assert(!memcmp(string, value, string_length));
-
-  free(string);
-  free(value);
+  (void)p;
+
+  return TEST_SUCCESS;
 }
 
-void get_test4(memcached_st *memc)
+static inline void set_default_fn(test_callback_fn *fn)
 {
-  memcached_return rc;
-  char *key= "foo";
-  char *value;
-  size_t value_length= 8191;
-  char *string;
-  size_t string_length;
-  uint16_t flags;
-  int x;
-
-  value = (char*)malloc(value_length);
-  assert(value);
-
-  for (x= 0; x < value_length; x++)
-    value[x] = (char) (x % 127);
-
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, value_length,
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  for (x= 0; x < 10; x++)
+  if (*fn == NULL)
   {
-    string= memcached_get(memc, key, strlen(key),
-                          &string_length, &flags, &rc);
-
-    assert(rc == MEMCACHED_SUCCESS);
-    assert(string);
-    assert(string_length == value_length);
-    assert(!memcmp(string, value, string_length));
-    free(string);
+    *fn= _default_callback;
   }
-
-  free(value);
 }
 
-void stats_servername_test(memcached_st *memc)
+static collection_st *init_world(world_st *world)
 {
-  memcached_return rc;
-  memcached_stat_st stat;
-  rc= memcached_stat_servername(&stat, NULL,
-                                 "localhost", 
-                                 MEMCACHED_DEFAULT_PORT);
-}
+  if (! world->runner)
+  {
+    world->runner= &defualt_runners;
+  }
 
-void increment_test(memcached_st *memc)
-{
-  unsigned int new_number;
-  memcached_return rc;
-  char *key= "number";
-  char *value= "0";
-
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  rc= memcached_increment(memc, key, strlen(key),
-                          1, &new_number);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(new_number == 1);
-
-  rc= memcached_increment(memc, key, strlen(key),
-                          1, &new_number);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(new_number == 2);
-}
+  set_default_fn(&world->collection.startup);
+  set_default_fn(&world->collection.shutdown);
 
-void decrement_test(memcached_st *memc)
-{
-  unsigned int new_number;
-  memcached_return rc;
-  char *key= "number";
-  char *value= "3";
-
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)0, (uint16_t)0);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  rc= memcached_decrement(memc, key, strlen(key),
-                          1, &new_number);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(new_number == 2);
-
-  rc= memcached_decrement(memc, key, strlen(key),
-                          1, &new_number);
-  assert(rc == MEMCACHED_SUCCESS);
-  assert(new_number == 1);
+  return world->collections;
 }
 
-void quit_test(memcached_st *memc)
-{
-  memcached_return rc;
-  char *key= "fudge";
-  char *value= "sanford and sun";
-
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)10, (uint16_t)3);
-  assert(rc == MEMCACHED_SUCCESS);
-  memcached_quit(memc);
-
-  rc= memcached_set(memc, key, strlen(key), 
-                    value, strlen(value),
-                    (time_t)50, (uint16_t)9);
-  assert(rc == MEMCACHED_SUCCESS);
-}
 
-void mget_test(memcached_st *memc)
+int main(int argc, char *argv[])
 {
-  memcached_return rc;
-  char *keys[]= {"fudge", "son", "food"};
-  size_t key_length[]= {5, 3, 4};
+  test_return_t return_code;
   unsigned int x;
-  uint16_t flags;
-
-  char return_key[MEMCACHED_MAX_KEY];
-  size_t return_key_length;
-  char *return_value;
-  size_t return_value_length;
-
-  /* We need to empty the server before continueing test */
-  rc= memcached_flush(memc, 0);
-  assert(rc == MEMCACHED_SUCCESS);
+  char *collection_to_run= NULL;
+  char *wildcard= NULL;
+  world_st world;
+  collection_st *collection;
+  collection_st *next;
+  void *world_ptr;
 
-  rc= memcached_mget(memc, keys, key_length, 3);
-  assert(rc == MEMCACHED_SUCCESS);
+  world_stats_st stats;
 
-  while ((return_value= memcached_fetch(memc, return_key, &return_key_length, 
-                      &return_value_length, &flags, &rc)) != NULL)
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+  if (sasl_client_init(NULL) != SASL_OK)
   {
-    assert(return_value);
+     fprintf(stderr, "Failed to initialize sasl library!\n");
+     return 1;
   }
-  assert(!return_value);
-  assert(return_value_length == 0);
-  assert(rc == MEMCACHED_NOTFOUND);
+#endif
 
-  for (x= 0; x < 3; x++)
-  {
-    rc= memcached_set(memc, keys[x], key_length[x], 
-                      keys[x], key_length[x],
-                      (time_t)50, (uint16_t)9);
-    assert(rc == MEMCACHED_SUCCESS);
-  }
+  memset(&stats, 0, sizeof(stats));
+  memset(&world, 0, sizeof(world));
+  get_world(&world);
 
-  rc= memcached_mget(memc, keys, key_length, 3);
-  assert(rc == MEMCACHED_SUCCESS);
+  collection= init_world(&world);
 
-  x= 0;
-  while ((return_value= memcached_fetch(memc, return_key, &return_key_length, 
-                                        &return_value_length, &flags, &rc)))
+  if (world.create)
   {
-    assert(return_value);
-    assert(rc == MEMCACHED_SUCCESS);
-    assert(return_key_length == return_value_length);
-    assert(!memcmp(return_value, return_key, return_value_length));
-    free(return_value);
-    x++;
+    test_return_t error;
+    world_ptr= world.create(&error);
+    if (error != TEST_SUCCESS)
+      exit(1);
   }
-}
-
-void get_stats_keys(memcached_st *memc)
-{
- char **list;
- char **ptr;
- memcached_stat_st stat;
- memcached_return rc;
-
- list= memcached_stat_get_keys(memc, &stat, &rc);
- assert(rc == MEMCACHED_SUCCESS);
- for (ptr= list; *ptr; ptr++)
-   printf("Found key %s\n", *ptr);
- fflush(stdout);
-
- free(list);
-}
-
-void get_stats(memcached_st *memc)
-{
- unsigned int x;
- char **list;
- char **ptr;
- memcached_return rc;
- memcached_stat_st *stat;
-
- stat= memcached_stat(memc, NULL, &rc);
- assert(rc == MEMCACHED_SUCCESS);
-
- assert(rc == MEMCACHED_SUCCESS);
- assert(stat);
-
- for (x= 0; x < memcached_server_count(memc); x++)
- {
-   list= memcached_stat_get_keys(memc, &stat[x], &rc);
-   assert(rc == MEMCACHED_SUCCESS);
-   for (ptr= list; *ptr; ptr++)
-     printf("Found key %s\n", *ptr);
-
-   free(list);
- }
-
- free(stat);
-}
-
-void add_host_test(memcached_st *memc)
-{
-  unsigned int x;
-  memcached_server_st *servers;
-  memcached_return rc;
-  char servername[]= "0.example.com";
-
-  servers= memcached_server_list_append(NULL, servername, 400, &rc);
-  assert(servers);
-  assert(1 == memcached_server_list_count(servers));
-
-  for (x= 2; x < 20; x++)
+  else
   {
-    char buffer[SMALL_STRING_LEN];
-
-    snprintf(buffer, SMALL_STRING_LEN, "%u.example.com", 400+x);
-    servers= memcached_server_list_append(servers, buffer, 401, 
-                                     &rc);
-    assert(rc == MEMCACHED_SUCCESS);
-    assert(x == memcached_server_list_count(servers));
+    world_ptr= NULL;
   }
 
-  rc= memcached_server_push(memc, servers);
-  assert(rc == MEMCACHED_SUCCESS);
-  rc= memcached_server_push(memc, servers);
-  assert(rc == MEMCACHED_SUCCESS);
-
-  memcached_server_list_free(servers);
-}
-
-/* We don't test the behavior itself, we test the switches */
-void behavior_test(memcached_st *memc)
-{
-  unsigned long long value;
-  unsigned int set= 1;
-
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, &set);
-  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK);
-  assert(value == 1);
-
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, &set);
-  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY);
-  assert(value == 1);
-
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_MD5_HASHING, &set);
-  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_MD5_HASHING);
-  assert(value == 1);
-
-  set= 0;
-
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, &set);
-  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_NO_BLOCK);
-  assert(value == 0);
-
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, &set);
-  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY);
-  assert(value == 0);
-
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_MD5_HASHING, &set);
-  value= memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_MD5_HASHING);
-  assert(value == 0);
-}
-
-/* Test case provided by Cal Haldenbrand */
-void user_supplied_bug1(memcached_st *memc)
-{
-  unsigned int setter= 1;
-  unsigned int x;
-
-  long total= 0;
-  int size= 0;
-  srand(time(NULL));
-  char key[10];
-  char *randomstuff = (char *)malloc(6 * 1024); 
-  memset(randomstuff, 0, 6 * 1024);
-
-  memcached_return rc;
-
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, &setter);
-  memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, &setter);
+  if (argc > 1)
+    collection_to_run= argv[1];
 
+  if (argc == 3)
+    wildcard= argv[2];
 
-  /* add key */
-  for (x= 0 ; total < 20 * 1024576 ; x++ )
+  for (next= collection; next->name; next++)
   {
-    unsigned int j= 0;
-
-    size= (rand() % ( 5 * 1024 ) ) + 400;
-    memset(randomstuff, 0, 6 * 1024);
-    assert(size < 6 * 1024); /* Being safe here */
-
-    for (j= 0 ; j < size ;j++) 
-      randomstuff[j] = (char) (rand() % 26) + 97;
-
-    total += size;
-    sprintf(key, "%d", x);
-    rc = memcached_set(memc, key, strlen(key), 
-                       randomstuff, strlen(randomstuff), 10, 0);
-    /* If we fail, lets try again */
-    if (rc != MEMCACHED_SUCCESS)
-      rc = memcached_set(memc, key, strlen(key), 
-                         randomstuff, strlen(randomstuff), 10, 0);
-    assert(rc == MEMCACHED_SUCCESS);
-  }
-}
-void add_host_test1(memcached_st *memc)
-{
-  unsigned int x;
-  memcached_return rc;
-  char servername[]= "0.example.com";
-  memcached_server_st *servers;
+    test_return_t collection_rc= TEST_SUCCESS;
+    test_st *run;
+    bool failed= false;
+    bool skipped= false;
 
-  servers= memcached_server_list_append(NULL, servername, 400, &rc);
-  assert(servers);
-  assert(1 == memcached_server_list_count(servers));
+    run= next->tests;
+    if (collection_to_run && fnmatch(collection_to_run, next->name, 0))
+      continue;
 
-  for (x= 2; x < 20; x++)
-  {
-    char buffer[SMALL_STRING_LEN];
+    stats.collection_total++;
 
-    snprintf(buffer, SMALL_STRING_LEN, "%u.example.com", 400+x);
-    servers= memcached_server_list_append(servers, buffer, 401, 
-                                     &rc);
-    assert(rc == MEMCACHED_SUCCESS);
-    assert(x == memcached_server_list_count(servers));
-  }
+    collection_rc= world.collection.startup(world_ptr);
 
-  rc= memcached_server_push(memc, servers);
-  assert(rc == MEMCACHED_SUCCESS);
-  rc= memcached_server_push(memc, servers);
-  assert(rc == MEMCACHED_SUCCESS);
+    if (collection_rc != TEST_SUCCESS)
+      goto skip_pre;
 
-  memcached_server_list_free(servers);
-}
+    if (next->pre)
+    {
+      collection_rc= world.runner->pre(next->pre, world_ptr);
+    }
 
-typedef struct test_st test_st;
+skip_pre:
+    switch (collection_rc)
+    {
+      case TEST_SUCCESS:
+        fprintf(stderr, "\n%s\n\n", next->name);
+        break;
+      case TEST_FAILURE:
+        fprintf(stderr, "\n%s [ failed ]\n\n", next->name);
+        stats.collection_failed++;
+        goto cleanup;
+      case TEST_SKIPPED:
+        fprintf(stderr, "\n%s [ skipping ]\n\n", next->name);
+        stats.collection_skipped++;
+        goto cleanup;
+      case TEST_MEMORY_ALLOCATION_FAILURE:
+      case TEST_MAXIMUM_RETURN:
+      default:
+        assert(0);
+        break;
+    }
 
-struct test_st {
-  char *function_name;
-  unsigned int requires_flush;
-  void (*function)(memcached_st *memc);
-};
 
-int main(int argc, char *argv[])
-{
-  unsigned int x;
-  char *server_list;
-  char *test_to_run= NULL;
-  char *wildcard= NULL;
-  memcached_server_st *servers;
+    for (x= 0; run->name; run++)
+    {
+      struct timeval start_time, end_time;
+      long int load_time= 0;
 
-  if (argc > 2)
-    test_to_run= argv[1];
+      if (wildcard && fnmatch(wildcard, run->name, 0))
+        continue;
 
-  if (argc == 3)
-    wildcard= argv[2];
+      fprintf(stderr, "Testing %s", run->name);
 
-  if (!(server_list= getenv("MEMCACHED_SERVERS")))
-    server_list= "localhost";
+      if (world.test.startup)
+      {
+        world.test.startup(world_ptr);
+      }
 
-  printf("servers %s\n", server_list);
-  srandom(time(NULL));
+      if (run->requires_flush && world.test.flush)
+      {
+        world.test.flush(world_ptr);
+      }
 
-  servers= memcached_servers_parse(server_list);
-  assert(servers);
+      if (world.test.pre_run)
+      {
+        world.test.pre_run(world_ptr);
+      }
 
-  for (x= 0; x < memcached_server_list_count(servers); x++)
-  {
-    printf("\t%s : %u\n", servers[x].hostname, servers[x].port);
-    assert(servers[x].stack_responses == 0);
-    assert(servers[x].fd == -1);
-    assert(servers[x].cursor_active == 0);
-  }
 
-  printf("\n");
-
-  /* Clean the server before beginning testing */
-  test_st tests[] ={
-    {"flush", 0, flush_test },
-    {"init", 0, init_test },
-    {"allocation", 0, allocation_test },
-    {"error", 0, error_test },
-    {"set", 0, set_test },
-    {"set2", 0, set_test2 },
-    {"set3", 0, set_test3 },
-    {"add", 0, add_test },
-    {"replace", 0, replace_test },
-    {"delete", 1, delete_test },
-    {"get", 0, get_test },
-    {"get2", 0, get_test2 },
-    {"get3", 0, get_test3 },
-    {"get4", 0, get_test4 },
-    {"stats_servername", 0, stats_servername_test },
-    {"increment", 0, increment_test },
-    {"decrement", 0, decrement_test },
-    {"quit", 0, quit_test },
-    {"mget", 0, mget_test },
-    {"get_stats", 0, get_stats },
-    {"add_host_test", 0, add_host_test },
-    {"get_stats_keys", 0, get_stats_keys },
-    {"behavior_test", 0, get_stats_keys },
-    {0, 0, 0}
-  };
-
-  test_st user_tests[] ={
-    {"user_supplied_bug1", 0, user_supplied_bug1 },
-    {0, 0, 0}
-  };
-
-  if ((test_to_run && !strcmp(test_to_run, "block")) || !test_to_run)
-  {
-    fprintf(stderr, "\nBlock tests\n\n");
-    for (x= 0; tests[x].function_name; x++)
-    {
-      if (wildcard)
-        if (strcmp(wildcard, tests[x].function_name))
-          continue;
+      // Runner code
+      {
+#if 0
+        if (next->pre && world.runner->pre)
+        {
+          return_code= world.runner->pre(next->pre, world_ptr);
+
+          if (return_code != TEST_SUCCESS)
+          {
+            goto error;
+          }
+        }
+#endif
+
+        gettimeofday(&start_time, NULL);
+        return_code= world.runner->run(run->test_fn, world_ptr);
+        gettimeofday(&end_time, NULL);
+        load_time= timedif(end_time, start_time);
+
+#if 0
+        if (next->post && world.runner->post)
+        {
+          (void) world.runner->post(next->post, world_ptr);
+        }
+#endif
+      }
 
-      memcached_st *memc;
-      memcached_return rc;
-      struct timeval start_time, end_time;
+      if (world.test.post_run)
+      {
+        world.test.post_run(world_ptr);
+      }
 
-      memc= memcached_create(NULL);
-      assert(memc);
+      stats.total++;
 
-      rc= memcached_server_push(memc, servers);
-      assert(rc == MEMCACHED_SUCCESS);
+      fprintf(stderr, "\t\t\t\t\t");
 
-      unsigned int loop;
-      for (loop= 0; loop < memcached_server_list_count(servers); loop++)
+      switch (return_code)
       {
-        assert(memc->hosts[loop].stack_responses == 0);
-        assert(memc->hosts[loop].fd == -1);
-        assert(memc->hosts[loop].cursor_active == 0);
+      case TEST_SUCCESS:
+        fprintf(stderr, "%ld.%03ld ", load_time / 1000, load_time % 1000);
+        stats.success++;
+        break;
+      case TEST_FAILURE:
+        stats.failed++;
+        failed= true;
+        break;
+      case TEST_SKIPPED:
+        stats.skipped++;
+        skipped= true;
+        break;
+      case TEST_MEMORY_ALLOCATION_FAILURE:
+        fprintf(stderr, "Exhausted memory, quitting\n");
+        abort();
+      case TEST_MAXIMUM_RETURN:
+      default:
+        assert(0); // Coding error.
+        break;
       }
 
-      fprintf(stderr, "Testing %s", tests[x].function_name);
-      gettimeofday(&start_time, NULL);
-      tests[x].function(memc);
-      gettimeofday(&end_time, NULL);
-      long int load_time= timedif(end_time, start_time);
-      fprintf(stderr, "\t\t\t\t\t %ld.%03ld [ ok ]\n", load_time / 1000, 
-              load_time % 1000);
-      assert(memc);
-      memcached_free(memc);
-    }
-  }
+      fprintf(stderr, "[ %s ]\n", test_strerror(return_code));
 
-  if ((test_to_run && !strcmp(test_to_run, "nonblock")) || !test_to_run)
-  {
-    fprintf(stderr, "\nNonblock tests\n\n");
-    for (x= 0; tests[x].function_name; x++)
-    {
-      if (wildcard)
-        if (strcmp(wildcard, tests[x].function_name))
-          continue;
-
-      memcached_st *memc;
-      memcached_return rc;
-      struct timeval start_time, end_time;
+      if (world.test.on_error)
+      {
+        test_return_t rc;
+        rc= world.test.on_error(return_code, world_ptr);
 
-      memc= memcached_create(NULL);
-      assert(memc);
-
-      rc= memcached_server_push(memc, servers);
-      assert(rc == MEMCACHED_SUCCESS);
-
-      fprintf(stderr, "Testing %s", tests[x].function_name);
-      memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, NULL);
-      gettimeofday(&start_time, NULL);
-      tests[x].function(memc);
-      gettimeofday(&end_time, NULL);
-      long int load_time= timedif(end_time, start_time);
-      fprintf(stderr, "\t\t\t\t\t %ld.%03ld [ ok ]\n", load_time / 1000, 
-              load_time % 1000);
-      assert(memc);
-      memcached_free(memc);
+        if (rc != TEST_SUCCESS)
+          break;
+      }
     }
-  }
 
-  if ((test_to_run && !strcmp(test_to_run, "nodelay")) || !test_to_run)
-  {
-    fprintf(stderr, "\nTCP Nodelay tests\n\n");
-    for (x= 0; tests[x].function_name; x++)
+    if (next->post && world.runner->post)
     {
-      if (wildcard)
-        if (strcmp(wildcard, tests[x].function_name))
-          continue;
-
-      memcached_st *memc;
-      memcached_return rc;
-      struct timeval start_time, end_time;
-
-      memc= memcached_create(NULL);
-      assert(memc);
-
-      rc= memcached_server_push(memc, servers);
-      assert(rc == MEMCACHED_SUCCESS);
-
-      fprintf(stderr, "Testing %s", tests[x].function_name);
-      memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_NO_BLOCK, NULL);
-      memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_TCP_NODELAY, NULL);
-      gettimeofday(&start_time, NULL);
-      tests[x].function(memc);
-      gettimeofday(&end_time, NULL);
-      long int load_time= timedif(end_time, start_time);
-      fprintf(stderr, "\t\t\t\t\t %ld.%03ld [ ok ]\n", load_time / 1000, 
-              load_time % 1000);
-      assert(memc);
-      memcached_free(memc);
+      (void) world.runner->post(next->post, world_ptr);
     }
-  }
 
-  if ((test_to_run && !strcmp(test_to_run, "md5")) || !test_to_run)
-  {
-    fprintf(stderr, "\nMD5 Hashing\n\n");
-    for (x= 0; tests[x].function_name; x++)
+    if (! failed && ! skipped)
     {
-      if (wildcard)
-        if (strcmp(wildcard, tests[x].function_name))
-          continue;
-
-      memcached_st *memc;
-      memcached_return rc;
-      struct timeval start_time, end_time;
-
-      memc= memcached_create(NULL);
-      assert(memc);
-
-      rc= memcached_server_push(memc, servers);
-      assert(rc == MEMCACHED_SUCCESS);
-
-      fprintf(stderr, "Testing %s", tests[x].function_name);
-      memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_MD5_HASHING, NULL);
-      gettimeofday(&start_time, NULL);
-      tests[x].function(memc);
-      gettimeofday(&end_time, NULL);
-      long int load_time= timedif(end_time, start_time);
-      fprintf(stderr, "\t\t\t\t\t %ld.%03ld [ ok ]\n", load_time / 1000, 
-              load_time % 1000);
-      assert(memc);
-      memcached_free(memc);
+      stats.collection_success++;
     }
+cleanup:
+
+    world.collection.shutdown(world_ptr);
   }
 
-  if ((test_to_run && !strcmp(test_to_run, "user")) || !test_to_run)
+  if (stats.collection_failed || stats.collection_skipped)
   {
-    fprintf(stderr, "\nUser Supplied tests\n\n");
-    for (x= 0; user_tests[x].function_name; x++)
-    {
-      if (wildcard)
-        if (strcmp(wildcard, tests[x].function_name))
-          continue;
+    fprintf(stderr, "Some test failures and/or skipped test occurred.\n\n");
+  }
+  else
+  {
+    fprintf(stderr, "All tests completed successfully\n\n");
+  }
 
-      memcached_st *memc;
-      memcached_return rc;
-      struct timeval start_time, end_time;
+  if (world.destroy)
+  {
+    test_return_t error;
+    error= world.destroy(world_ptr);
 
-      memc= memcached_create(NULL);
-      assert(memc);
-
-      rc= memcached_server_push(memc, servers);
-      assert(rc == MEMCACHED_SUCCESS);
-
-      fprintf(stderr, "Testing %s", user_tests[x].function_name);
-      gettimeofday(&start_time, NULL);
-      user_tests[x].function(memc);
-      gettimeofday(&end_time, NULL);
-      long int load_time= timedif(end_time, start_time);
-      fprintf(stderr, "\t\t\t\t\t %ld.%03ld [ ok ]\n", load_time / 1000, 
-              load_time % 1000);
-      assert(memc);
-      memcached_free(memc);
+    if (error != TEST_SUCCESS)
+    {
+      fprintf(stderr, "Failure during shutdown.\n");
+      stats.failed++; // We do this to make our exit code return 1
     }
   }
 
-  /* Clean up whatever we might have left */
-  {
-    memcached_st *memc;
-    memc= memcached_create(NULL);
-    assert(memc);
-    flush_test(memc);
-    memcached_free(memc);
-  }
+  world_stats_print(&stats);
 
-  fprintf(stderr, "All tests completed successfully\n\n");
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+  sasl_done();
+#endif
 
-  return 0;
+  return stats.failed == 0 ? 0 : 1;
 }