projects
/
m6w6
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (from parent 1:
178083b
)
Name correction for test system.
author
Brian Aker
<brian@gaz>
Mon, 11 Jan 2010 18:00:43 +0000
(10:00 -0800)
committer
Brian Aker
<brian@gaz>
Mon, 11 Jan 2010 18:00:43 +0000
(10:00 -0800)
tests/atomsmasher.c
patch
|
blob
|
history
tests/function.c
patch
|
blob
|
history
tests/libmemcached_world.h
patch
|
blob
|
history
tests/plus.cpp
patch
|
blob
|
history
tests/test.c
patch
|
blob
|
history
tests/test.h
patch
|
blob
|
history
tests/udp.c
patch
|
blob
|
history
diff --git
a/tests/atomsmasher.c
b/tests/atomsmasher.c
index d3074a7f1eb61da9aebb5a6b86d8af68b703016d..b0abc4ed38190668459445681969f870f44360db 100644
(file)
--- a/
tests/atomsmasher.c
+++ b/
tests/atomsmasher.c
@@
-235,7
+235,7
@@
collection_st collection[] ={
void get_world(world_st *world)
{
world->collections= 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;
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 71e13695095456a756a1ceb54bccfcc5f814a4fe..dc3436b17c4fa6173bc4276cb95006ca8fe9c324 100644
(file)
--- a/
tests/function.c
+++ b/
tests/function.c
@@
-5814,7
+5814,7
@@
collection_st collection[] ={
void get_world(world_st *world)
{
world->collections= 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;
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 a88b24cd1ece92ec92b9c6ba8a5273d24dcbc126..10cca65f0d3eeeeca5c87a3337129e0660efeb6b 100644
(file)
--- 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);
/* 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 *);
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);
{
memcached_return_t rc;
container->memc= memcached_create(NULL);
diff --git
a/tests/plus.cpp
b/tests/plus.cpp
index be6cde5098cfad6d1cd2e39a4799cfd7c3dbaf37..eba08c08d56460a7ae71cec10c72906fc76bb9c9 100644
(file)
--- a/
tests/plus.cpp
+++ b/
tests/plus.cpp
@@
-299,7
+299,7
@@
collection_st collection[] ={
void get_world(world_st *world)
{
world->collections= 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);
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 fb501fadc2edcc6d57270c2cd47ce52cdc21a5d8..ee6f94dcd3e5f0d1d6928513f4ecdc0e5764e1ed 100644
(file)
--- a/
tests/test.c
+++ b/
tests/test.c
@@
-161,9
+161,9
@@
int main(int argc, char *argv[])
fprintf(stderr, "Testing %s", run->name);
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)
}
if (run->requires_flush && world.flush)
diff --git
a/tests/test.h
b/tests/test.h
index 5d6bb4b72b70c8e775b0aa6a384fda28502d908a..7385763ddb9ef8d370852e87a9444fdd4c9d5831 100644
(file)
--- 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 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;
/* 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 669accebaa3262c6221719ab06a5c5025e4c42ee..c66f10853349a72979f17673a03b1c212a2aed7f 100644
(file)
--- a/
tests/udp.c
+++ b/
tests/udp.c
@@
-59,7
+59,7
@@
collection_st collection[] ={
void get_world(world_st *world)
{
world->collections= 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;
world->flush= (test_callback_fn)world_flush;
world->pre_run= (test_callback_fn)world_pre_run;
world->create= (test_callback_create_fn)world_create;