Modified test to allow it to run on slow machines (aka it ran too long)

[m6w6/libmemcached] / tests / test.c

diff --git a/tests/test.c b/tests/test.c
index 7d1a523caa84c9a500f013b126843cdb0f1b11a8..5653271aa6fe06d9f9ae06c6107d63cb92e45332 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -37,6 +37,43 @@ void allocation_test(memcached_st *not_used)
   memcached_free(memc);
 }
 
+void clone_test(memcached_st *memc)
+{
+  /* All null? */
+  {
+    memcached_st *clone;
+    clone= memcached_clone(NULL, NULL);
+    assert(clone);
+    memcached_free(clone);
+  }
+
+  /* Can we init from null? */
+  {
+    memcached_st *clone;
+    clone= memcached_clone(NULL, memc);
+    assert(clone);
+    memcached_free(clone);
+  }
+
+  /* Can we init from struct? */
+  {
+    memcached_st declared_clone;
+    memcached_st *clone;
+    clone= memcached_clone(&declared_clone, NULL);
+    assert(clone);
+    memcached_free(clone);
+  }
+
+  /* Can we init from struct? */
+  {
+    memcached_st declared_clone;
+    memcached_st *clone;
+    clone= memcached_clone(&declared_clone, memc);
+    assert(clone);
+    memcached_free(clone);
+  }
+}
+
 void connection_test(memcached_st *memc)
 {
   memcached_return rc;
@@ -572,9 +609,11 @@ void user_supplied_bug2(memcached_st *memc)
   memcached_behavior_set(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE, &setter);
   getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE);
   getter = memcached_behavior_get(memc, MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE);
-#endif
 
   for (x= 0, errors= 0, total= 0 ; total < 20 * 1024576 ; x++)
+#endif
+
+  for (x= 0, errors= 0, total= 0 ; total < 24576 ; x++)
   {
     memcached_return rc= MEMCACHED_SUCCESS;
     char buffer[SMALL_STRING_LEN];
@@ -832,6 +871,7 @@ int main(int argc, char *argv[])
     {"flush", 0, flush_test },
     {"init", 0, init_test },
     {"allocation", 0, allocation_test },
+    {"clone_test", 0, clone_test },
     {"error", 0, error_test },
     {"set", 0, set_test },
     {"set2", 0, set_test2 },
@@ -867,7 +907,7 @@ int main(int argc, char *argv[])
   test_st user_tests[] ={
     {"user_supplied_bug1", 0, user_supplied_bug1 },
     {"user_supplied_bug2", 0, user_supplied_bug2 },
-//    {"user_supplied_bug3", 0, user_supplied_bug3 },
+    {"user_supplied_bug3", 0, user_supplied_bug3 },
     {0, 0, 0}
   };
 
@@ -882,10 +922,6 @@ int main(int argc, char *argv[])
     {0, 0, 0, 0}
   };
 
-  /*
-  unsigned int next;
-  for (next= 0; collection[next].name; next++)
-*/
   collection_st *next;
   for (next= collection; next->name; next++)
   {