X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ftest.c;h=793bcbd7264d08af68112aefa033e4e931af0980;hb=7c986323bd4eece0d805f4df17eb03ea094f84f6;hp=2ea99ff2c05d2faf01e5892ca2adeeb7c61f8836;hpb=03a38ffb6dbde1be82141c71e22900e18d7b56fa;p=m6w6%2Flibmemcached

diff --git a/tests/test.c b/tests/test.c
index 2ea99ff2..793bcbd7 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -1,191 +1,244 @@
+/* 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 <assert.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 "server.h"
 
 #include "test.h"
 
-#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10 
-#define TEST_SERVERS 1
+static void world_stats_print(world_stats_st *stats)
+{
+  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)
+static long int timedif(struct timeval a, struct timeval b)
 {
   register int 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;
 }
 
-char *server_startup()
+static const char *test_strerror(test_return_t code)
 {
-  unsigned int x;
-  char server_string_buffer[8096];
-  char *end_ptr;
+  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();
+  }
 
-  end_ptr= server_string_buffer;
+}
 
-  for (x= 0; x < TEST_SERVERS; x++)
+void create_core(void)
+{
+  if (getenv("LIBMEMCACHED_NO_COREDUMP") == NULL)
   {
-    char buffer[1024]; /* Nothing special for number */
-    int count;
+    pid_t pid= fork();
 
-    sprintf(buffer, "memcached -d -P /tmp/%umemc.pid -p %u", x, x+ TEST_PORT_BASE);
-    system(buffer);
-    count= sprintf(end_ptr, "localhost:%u,", x + TEST_PORT_BASE);
-    end_ptr+= count;
+    if (pid == 0)
+    {
+      abort();
+    }
+    else
+    {
+      while (waitpid(pid, NULL, 0) != pid)
+      {
+        ;
+      }
+    }
   }
-  *end_ptr= 0;
-
-  return strdup(server_string_buffer);
 }
 
-void server_shutdown(char *server_string)
-{
-  unsigned int x;
 
-  for (x= 0; x < TEST_SERVERS; x++)
+static test_return_t _runner_default(test_callback_fn func, void *p)
+{
+  if (func)
+  {
+    return func(p);
+  }
+  else
   {
-    char buffer[1024]; /* Nothing special for number */
-    sprintf(buffer, "cat /tmp/%umemc.pid | xargs kill", x);
-    system(buffer);
+    return TEST_SUCCESS;
   }
-  if (server_string)
-    free(server_string);
 }
 
+static world_runner_st defualt_runners= {
+  _runner_default,
+  _runner_default,
+  _runner_default
+};
+
+
 int main(int argc, char *argv[])
 {
+  test_return_t return_code;
   unsigned int x;
-  char *server_list;
   char *collection_to_run= NULL;
   char *wildcard= NULL;
-  memcached_server_st *servers;
+  world_st world;
   collection_st *collection;
-  uint8_t failed;
-
-  collection= gets_collections();
-
+  collection_st *next;
+  void *world_ptr;
 
-  if (argc > 1)
-    collection_to_run= argv[1];
+  world_stats_st stats;
 
-  if (argc == 3)
-    wildcard= argv[2];
+  memset(&stats, 0, sizeof(stats));
+  memset(&world, 0, sizeof(world));
+  get_world(&world);
 
-  if ((server_list= getenv("MEMCACHED_SERVERS")))
-  {
-    printf("servers %s\n", server_list);
-    servers= memcached_servers_parse(server_list);
-    server_list= NULL;
-  }
-  else
+  if (! world.runner)
   {
-    server_list= server_startup();
-    printf("servers %s\n", server_list);
-    servers= memcached_servers_parse(server_list);
+    world.runner= &defualt_runners;
   }
-  assert(servers);
 
-  srandom(time(NULL));
+  collection= world.collections;
 
+  if (world.create)
+    world_ptr= world.create();
+  else
+    world_ptr= NULL;
 
-  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);
-  }
+  if (argc > 1)
+    collection_to_run= argv[1];
 
-  printf("\n");
+  if (argc == 3)
+    wildcard= argv[2];
 
-  collection_st *next;
   for (next= collection; next->name; next++)
   {
     test_st *run;
 
     run= next->tests;
-    if (collection_to_run && strcmp(collection_to_run, next->name))
+    if (collection_to_run && fnmatch(collection_to_run, next->name, 0))
       continue;
 
     fprintf(stderr, "\n%s\n\n", next->name);
 
     for (x= 0; run->name; run++)
     {
-      if (wildcard && strcmp(wildcard, run->name))
+      struct timeval start_time, end_time;
+      long int load_time= 0;
+
+      if (wildcard && fnmatch(wildcard, run->name, 0))
         continue;
 
       fprintf(stderr, "Testing %s", run->name);
 
-      memcached_st *memc;
-      memcached_return rc;
-      struct timeval start_time, end_time;
-
-      memc= memcached_create(NULL);
-      assert(memc);
-
-      if (run->requires_flush)
-        memcached_flush(memc, 0);
+      if (world.collection_startup)
+      {
+        world.collection_startup(world_ptr);
+      }
 
-      rc= memcached_server_push(memc, servers);
-      assert(rc == MEMCACHED_SUCCESS);
+      if (run->requires_flush && world.flush)
+      {
+        world.flush(world_ptr);
+      }
 
-      unsigned int loop;
-      for (loop= 0; loop < memcached_server_list_count(servers); loop++)
+      if (world.pre_run)
       {
-        assert(memc->hosts[loop].stack_responses == 0);
-        assert(memc->hosts[loop].fd == -1);
-        assert(memc->hosts[loop].cursor_active == 0);
+        world.pre_run(world_ptr);
       }
 
+
       if (next->pre)
       {
-        memcached_return rc;
-        rc= next->pre(memc);
+        return_code= world.runner->pre(next->pre, world_ptr);
 
-        if (rc != MEMCACHED_SUCCESS)
+        if (return_code != TEST_SUCCESS)
         {
-          fprintf(stderr, "\t\t\t\t\t [ skipping ]\n");
           goto error;
         }
       }
 
       gettimeofday(&start_time, NULL);
-      failed= run->function(memc);
+      return_code= world.runner->run(run->test_fn, world_ptr);
       gettimeofday(&end_time, NULL);
-      long int load_time= timedif(end_time, start_time);
-      if (failed)
-        fprintf(stderr, "\t\t\t\t\t %ld.%03ld [ failed ]\n", load_time / 1000, 
-                load_time % 1000);
-      else
-        fprintf(stderr, "\t\t\t\t\t %ld.%03ld [ ok ]\n", load_time / 1000, 
-                load_time % 1000);
+      load_time= timedif(end_time, start_time);
 
       if (next->post)
-        (void)next->post(memc);
+      {
+        (void) world.runner->pre(next->pre, world_ptr);
+      }
+
+      if (world.post_run)
+      {
+        world.post_run(world_ptr);
+      }
 
-      assert(memc);
 error:
-      memcached_free(memc);
+      stats.total++;
+
+      fprintf(stderr, "\t\t\t\t\t");
+
+      switch (return_code)
+      {
+      case TEST_SUCCESS:
+        fprintf(stderr, "%ld.%03ld ", load_time / 1000, load_time % 1000);
+        stats.success++;
+        break;
+      case TEST_FAILURE:
+        stats.failed++;
+        break;
+      case TEST_SKIPPED:
+        stats.skipped++;
+        break;
+      case TEST_MEMORY_ALLOCATION_FAILURE:
+      case TEST_MAXIMUM_RETURN:
+      default:
+        break;
+      }
+
+      fprintf(stderr, "[ %s ]\n", test_strerror(return_code));
+
+      if (world.on_error)
+      {
+        test_return_t rc;
+        rc= world.on_error(return_code, world_ptr);
+
+        if (rc != TEST_SUCCESS)
+          break;
+      }
     }
   }
 
   fprintf(stderr, "All tests completed successfully\n\n");
 
-  memcached_server_list_free(servers);
+  if (world.destroy)
+    world.destroy(world_ptr);
 
-  server_shutdown(server_list);
+  world_stats_print(&stats);
 
-  return 0;
+  return stats.failed == 0 ? 0 : 1;
 }