Extended test system to pin point specific test groups

diff --git a/ChangeLog b/ChangeLog
index eb5ebc9ee7e429e7c252496136f53954b9ab58bd..ba1e78d30389fad54a46512b17f0f934f758818f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 0.6
   * get value returns are now null terminated (request by Cal Heldenbrand) 
+  * Fixed for more hosts then two.
+  * Rewrite of the read/write IO systems to handle different sorts of host
+    failures.
 
 0.5 Tue Oct  9 00:22:25 PDT 2007
  * Ruby maintainer mentioned TCP_NODELAY patch he had added. Added this to C

diff --git a/tests/test.c b/tests/test.c
index 047ed29a95d31d7528dc88a77c54835ca1adee02..0e2bc1001d53d66fe5dc33f038fae18268302e34 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -572,11 +572,15 @@ int main(int argc, char *argv[])
 {
   unsigned int x;
   char *server_list;
+  char *test_to_run= NULL;
   char *wildcard= NULL;
   memcached_server_st *servers;
 
-  if (argc == 2)
-    wildcard= argv[1];
+  if (argc > 2)
+    test_to_run= argv[1];
+
+  if (argc == 3)
+    wildcard= argv[2];
 
   if (!(server_list= getenv("MEMCACHED_SERVERS")))
     server_list= "localhost";
@@ -630,126 +634,141 @@ int main(int argc, char *argv[])
     {0, 0, 0}
   };
 
-  fprintf(stderr, "\nBlock tests\n\n");
-  for (x= 0; tests[x].function_name; x++)
+  if ((test_to_run && !strcmp(test_to_run, "block")) || !test_to_run)
   {
-    if (wildcard)
-      if (strcmp(wildcard, tests[x].function_name))
-        continue;
-
-    memcached_st *memc;
-    memcached_return rc;
-    memc= memcached_create(NULL);
-    assert(memc);
-
-    rc= memcached_server_push(memc, servers);
-    assert(rc == MEMCACHED_SUCCESS);
-
-    unsigned int loop;
-    for (loop= 0; loop < memcached_server_list_count(servers); loop++)
+    fprintf(stderr, "\nBlock tests\n\n");
+    for (x= 0; tests[x].function_name; x++)
     {
-      assert(memc->hosts[loop].stack_responses == 0);
-      assert(memc->hosts[loop].fd == -1);
-      assert(memc->hosts[loop].cursor_active == 0);
+      if (wildcard)
+        if (strcmp(wildcard, tests[x].function_name))
+          continue;
+
+      memcached_st *memc;
+      memcached_return rc;
+      memc= memcached_create(NULL);
+      assert(memc);
+
+      rc= memcached_server_push(memc, servers);
+      assert(rc == MEMCACHED_SUCCESS);
+
+      unsigned int loop;
+      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);
+      }
+
+      fprintf(stderr, "Testing %s", tests[x].function_name);
+      tests[x].function(memc);
+      fprintf(stderr, "\t\t\t\t\t[ ok ]\n");
+      assert(memc);
+      memcached_free(memc);
     }
-
-    fprintf(stderr, "Testing %s", tests[x].function_name);
-    tests[x].function(memc);
-    fprintf(stderr, "\t\t\t\t\t[ ok ]\n");
-    assert(memc);
-    memcached_free(memc);
   }
 
-  fprintf(stderr, "\nNonblock tests\n\n");
-  for (x= 0; tests[x].function_name; x++)
+  if ((test_to_run && !strcmp(test_to_run, "nonblock")) || !test_to_run)
   {
-    if (wildcard)
-      if (strcmp(wildcard, tests[x].function_name))
-        continue;
-
-    memcached_st *memc;
-    memcached_return rc;
-    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);
-    tests[x].function(memc);
-    fprintf(stderr, "\t\t\t\t\t[ ok ]\n");
-    assert(memc);
-    memcached_free(memc);
+    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;
+      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);
+      tests[x].function(memc);
+      fprintf(stderr, "\t\t\t\t\t[ ok ]\n");
+      assert(memc);
+      memcached_free(memc);
+    }
   }
 
-  fprintf(stderr, "\nTCP Nodelay tests\n\n");
-  for (x= 0; tests[x].function_name; x++)
+  if ((test_to_run && !strcmp(test_to_run, "nodelay")) || !test_to_run)
   {
-    if (wildcard)
-      if (strcmp(wildcard, tests[x].function_name))
-        continue;
-
-    memcached_st *memc;
-    memcached_return rc;
-    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);
-    tests[x].function(memc);
-    fprintf(stderr, "\t\t\t\t\t[ ok ]\n");
-    assert(memc);
-    memcached_free(memc);
+    fprintf(stderr, "\nTCP Nodelay 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;
+      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);
+      tests[x].function(memc);
+      fprintf(stderr, "\t\t\t\t\t[ ok ]\n");
+      assert(memc);
+      memcached_free(memc);
+    }
   }
 
-  fprintf(stderr, "\nMD5 Hashing\n\n");
-  for (x= 0; tests[x].function_name; x++)
+  if ((test_to_run && !strcmp(test_to_run, "md5")) || !test_to_run)
   {
-    if (wildcard)
-      if (strcmp(wildcard, tests[x].function_name))
-        continue;
-
-    memcached_st *memc;
-    memcached_return rc;
-    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);
-    tests[x].function(memc);
-    fprintf(stderr, "\t\t\t\t\t[ ok ]\n");
-    assert(memc);
-    memcached_free(memc);
+    fprintf(stderr, "\nMD5 Hashing\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;
+      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);
+      tests[x].function(memc);
+      fprintf(stderr, "\t\t\t\t\t[ ok ]\n");
+      assert(memc);
+      memcached_free(memc);
+    }
   }
 
-  fprintf(stderr, "\nUser Supplied tests\n\n");
-  for (x= 0; user_tests[x].function_name; x++)
+  if ((test_to_run && !strcmp(test_to_run, "user")) || !test_to_run)
   {
-    if (wildcard)
-      if (strcmp(wildcard, tests[x].function_name))
-        continue;
-
-    memcached_st *memc;
-    memcached_return rc;
-    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);
-    user_tests[x].function(memc);
-    fprintf(stderr, "\t\t\t\t\t[ ok ]\n");
-    assert(memc);
-    memcached_free(memc);
+    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;
+
+      memcached_st *memc;
+      memcached_return rc;
+      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);
+      user_tests[x].function(memc);
+      fprintf(stderr, "\t\t\t\t\t[ ok ]\n");
+      assert(memc);
+      memcached_free(memc);
+    }
   }
 
   /* Clean up whatever we might have left */