Suggested change from Antony

[awesomized/libmemcached] / tests / test.c

diff --git a/tests/test.c b/tests/test.c
index 9ffe21c7e4e8d5dc4bf94d5b260235a2cf819775..f8cde94ddf5b3ecb8b0a5448b7108f7901ac09ef 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -10,11 +10,12 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <time.h>
+#include <fnmatch.h>
 
 #include "test.h"
 
 #define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT+10 
-#define TEST_SERVERS 2
+#define TEST_SERVERS 5
 
 long int timedif(struct timeval a, struct timeval b)
 {
@@ -119,7 +120,7 @@ int main(int argc, char *argv[])
     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);
@@ -131,7 +132,7 @@ int main(int argc, char *argv[])
       memcached_return rc;
       struct timeval start_time, end_time;
 
-      if (wildcard && strcmp(wildcard, run->name))
+      if (wildcard && fnmatch(wildcard, run->name, 0))
         continue;
 
       fprintf(stderr, "Testing %s", run->name);
@@ -158,9 +159,7 @@ int main(int argc, char *argv[])
       if (next->pre)
       {
         memcached_return rc;
-        WATCHPOINT_STRING(next->name);
         rc= next->pre(memc);
-        WATCHPOINT;
 
         if (rc != MEMCACHED_SUCCESS)
         {