From: Brian Aker <brian@gaz>
Date: Mon, 11 Jan 2010 18:00:43 +0000 (-0800)
Subject: Name correction for test system.
X-Git-Tag: 0.37~7
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=e26021d3a6abec207f79f129d620cef1c9a18e9a;hp=178083badd2dcd43bdd6b01dd2eb062ac8e37303;p=m6w6%2Flibmemcached

Name correction for test system.
---

diff --git a/tests/atomsmasher.c b/tests/atomsmasher.c
index d3074a7f..b0abc4ed 100644
--- a/tests/atomsmasher.c
+++ b/tests/atomsmasher.c
@@ -235,7 +235,7 @@ collection_st collection[] ={
 void get_world(world_st *world)
 {
   world->collections= collection;
-  world->collection_startup= (test_callback_fn)world_collection_startup;
+  world->test_startup= (test_callback_fn)world_test_startup;
   world->flush= (test_callback_fn)world_flush;
   world->pre_run= (test_callback_fn)world_pre_run;
   world->create= (test_callback_create_fn)world_create;
diff --git a/tests/function.c b/tests/function.c
index 71e13695..dc3436b1 100644
--- a/tests/function.c
+++ b/tests/function.c
@@ -5814,7 +5814,7 @@ collection_st collection[] ={
 void get_world(world_st *world)
 {
   world->collections= collection;
-  world->collection_startup= (test_callback_fn)world_collection_startup;
+  world->test_startup= (test_callback_fn)world_test_startup;
   world->flush= (test_callback_fn)world_flush;
   world->pre_run= (test_callback_fn)world_pre_run;
   world->create= (test_callback_create_fn)world_create;
diff --git a/tests/libmemcached_world.h b/tests/libmemcached_world.h
index a88b24cd..10cca65f 100644
--- a/tests/libmemcached_world.h
+++ b/tests/libmemcached_world.h
@@ -22,7 +22,7 @@ typedef struct
 
 /* Prototypes for functions we will pass to test framework */
 libmemcached_test_container_st *world_create(test_return_t *error);
-test_return_t world_collection_startup(libmemcached_test_container_st *);
+test_return_t world_test_startup(libmemcached_test_container_st *);
 test_return_t world_flush(libmemcached_test_container_st *container);
 test_return_t world_pre_run(libmemcached_test_container_st *);
 
@@ -52,7 +52,7 @@ libmemcached_test_container_st *world_create(test_return_t *error)
 }
 
 
-test_return_t world_collection_startup(libmemcached_test_container_st *container)
+test_return_t world_test_startup(libmemcached_test_container_st *container)
 {
   memcached_return_t rc;
   container->memc= memcached_create(NULL);
diff --git a/tests/plus.cpp b/tests/plus.cpp
index be6cde50..eba08c08 100644
--- a/tests/plus.cpp
+++ b/tests/plus.cpp
@@ -299,7 +299,7 @@ collection_st collection[] ={
 void get_world(world_st *world)
 {
   world->collections= collection;
-  world->collection_startup= reinterpret_cast<test_callback_fn>(world_collection_startup);
+  world->test_startup= reinterpret_cast<test_callback_fn>(world_test_startup);
   world->flush= reinterpret_cast<test_callback_fn>(world_flush);
   world->pre_run= reinterpret_cast<test_callback_fn>(world_pre_run);
   world->create= reinterpret_cast<test_callback_create_fn>(world_create);
diff --git a/tests/test.c b/tests/test.c
index fb501fad..ee6f94dc 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -161,9 +161,9 @@ int main(int argc, char *argv[])
 
       fprintf(stderr, "Testing %s", run->name);
 
-      if (world.collection_startup)
+      if (world.test_startup)
       {
-        world.collection_startup(world_ptr);
+        world.test_startup(world_ptr);
       }
 
       if (run->requires_flush && world.flush)
diff --git a/tests/test.h b/tests/test.h
index 5d6bb4b7..7385763d 100644
--- a/tests/test.h
+++ b/tests/test.h
@@ -83,7 +83,7 @@ struct world_st {
   test_callback_fn destroy;
 
   /* This is called a the beginning of any collection run. */
-  test_callback_fn collection_startup;
+  test_callback_fn test_startup;
 
   /* This called on a test if the test requires a flush call (the bool is from test_st) */
   test_callback_fn flush;
diff --git a/tests/udp.c b/tests/udp.c
index 669acceb..c66f1085 100644
--- a/tests/udp.c
+++ b/tests/udp.c
@@ -59,7 +59,7 @@ collection_st collection[] ={
 void get_world(world_st *world)
 {
   world->collections= collection;
-  world->collection_startup= (test_callback_fn)world_collection_startup;
+  world->test_startup= (test_callback_fn)world_test_startup;
   world->flush= (test_callback_fn)world_flush;
   world->pre_run= (test_callback_fn)world_pre_run;
   world->create= (test_callback_create_fn)world_create;