X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Ftest.c;h=49ae022a318341de3fd5e7e763512ea6d3c32b37;hb=b10a03e4afb5514f1c86f5c75b9bfc7d46ce49b4;hp=2ea99ff2c05d2faf01e5892ca2adeeb7c61f8836;hpb=03a38ffb6dbde1be82141c71e22900e18d7b56fa;p=awesomized%2Flibmemcached

diff --git a/tests/test.c b/tests/test.c
index 2ea99ff2..49ae022a 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -2,7 +2,6 @@
   Sample test application.
 */
 #include <assert.h>
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/time.h>
@@ -10,13 +9,12 @@
 #include <sys/stat.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
-
-long int timedif(struct timeval a, struct timeval b)
+static long int timedif(struct timeval a, struct timeval b)
 {
   register int us, s;
 
@@ -27,55 +25,30 @@ long int timedif(struct timeval a, struct timeval b)
   return s + us;
 }
 
-char *server_startup()
-{
-  unsigned int x;
-  char server_string_buffer[8096];
-  char *end_ptr;
-
-  end_ptr= server_string_buffer;
-
-  for (x= 0; x < TEST_SERVERS; x++)
-  {
-    char buffer[1024]; /* Nothing special for number */
-    int count;
-
-    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;
-  }
-  *end_ptr= 0;
-
-  return strdup(server_string_buffer);
-}
-
-void server_shutdown(char *server_string)
-{
-  unsigned int x;
-
-  for (x= 0; x < TEST_SERVERS; x++)
-  {
-    char buffer[1024]; /* Nothing special for number */
-    sprintf(buffer, "cat /tmp/%umemc.pid | xargs kill", x);
-    system(buffer);
-  }
-  if (server_string)
-    free(server_string);
-}
-
 int main(int argc, char *argv[])
 {
   unsigned int x;
-  char *server_list;
   char *collection_to_run= NULL;
   char *wildcard= NULL;
+  server_startup_st *startup_ptr;
   memcached_server_st *servers;
+  world_st world;
   collection_st *collection;
+  collection_st *next;
   uint8_t failed;
+  void *world_ptr;
+
+  memset(&world, 0, sizeof(world_st));
+  get_world(&world);
+  collection= world.collections;
 
-  collection= gets_collections();
+  if (world.create)
+    world_ptr= world.create();
+  else 
+    world_ptr= NULL;
 
+  startup_ptr= (server_startup_st *)world_ptr;
+  servers= (memcached_server_st *)startup_ptr->servers;
 
   if (argc > 1)
     collection_to_run= argv[1];
@@ -83,68 +56,43 @@ int main(int argc, char *argv[])
   if (argc == 3)
     wildcard= argv[2];
 
-  if ((server_list= getenv("MEMCACHED_SERVERS")))
-  {
-    printf("servers %s\n", server_list);
-    servers= memcached_servers_parse(server_list);
-    server_list= NULL;
-  }
-  else
-  {
-    server_list= server_startup();
-    printf("servers %s\n", server_list);
-    servers= memcached_servers_parse(server_list);
-  }
-  assert(servers);
-
-  srandom(time(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);
-  }
-
-  printf("\n");
-
-  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))
-        continue;
-
-      fprintf(stderr, "Testing %s", run->name);
-
+      unsigned int loop;
       memcached_st *memc;
       memcached_return rc;
       struct timeval start_time, end_time;
+      long int load_time;
+
+      if (wildcard && fnmatch(wildcard, run->name, 0))
+        continue;
+
+      fprintf(stderr, "Testing %s", run->name);
 
       memc= memcached_create(NULL);
       assert(memc);
 
-      if (run->requires_flush)
-        memcached_flush(memc, 0);
-
       rc= memcached_server_push(memc, servers);
       assert(rc == MEMCACHED_SUCCESS);
 
-      unsigned int loop;
+      if (run->requires_flush)
+      {
+        memcached_flush(memc, 0);
+        memcached_quit(memc);
+      }
+
       for (loop= 0; loop < memcached_server_list_count(servers); loop++)
       {
-        assert(memc->hosts[loop].stack_responses == 0);
         assert(memc->hosts[loop].fd == -1);
         assert(memc->hosts[loop].cursor_active == 0);
       }
@@ -164,7 +112,7 @@ int main(int argc, char *argv[])
       gettimeofday(&start_time, NULL);
       failed= run->function(memc);
       gettimeofday(&end_time, NULL);
-      long int load_time= timedif(end_time, start_time);
+      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);
@@ -183,9 +131,8 @@ error:
 
   fprintf(stderr, "All tests completed successfully\n\n");
 
-  memcached_server_list_free(servers);
-
-  server_shutdown(server_list);
+  if (world.destroy)
+    world.destroy(world_ptr);
 
   return 0;
 }