projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge trunk
[awesomized/libmemcached]
/
tests
/
mem_udp.cc
diff --git
a/tests/mem_udp.cc
b/tests/mem_udp.cc
index 2a82482f9feaca230428cf84b52c2d01a9c4ae5a..077f8c99815f7a9c24f437a4c8c1a18d49d32d2c 100644
(file)
--- a/
tests/mem_udp.cc
+++ b/
tests/mem_udp.cc
@@
-10,9
+10,14
@@
Sample test application.
*/
Sample test application.
*/
-#include <libtest/common.h>
+#include <config.h>
+#include <libtest/test.hpp>
-#include <libmemcached/common.h>
+using namespace libtest;
+
+#include <libmemcached/memcached.h>
+#include <libmemcached/server_instance.h>
+#include <libmemcached/io.h>
#include <assert.h>
#include <stdio.h>
#include <assert.h>
#include <stdio.h>
@@
-28,8
+33,6
@@
#include <libtest/server.h>
#include <libtest/server.h>
-#define SERVERS_TO_CREATE 5
-
#ifndef __INTEL_COMPILER
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
#ifndef __INTEL_COMPILER
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
@@
-486,8
+489,7
@@
collection_st collection[] ={
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
-#define SERVERS_TO_CREATE 5
-
+#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
#include "libmemcached_world.h"
void get_world(Framework *world)
#include "libmemcached_world.h"
void get_world(Framework *world)
@@
-495,7
+497,7
@@
void get_world(Framework *world)
world->collections= collection;
world->_create= (test_callback_create_fn*)world_create;
world->collections= collection;
world->_create= (test_callback_create_fn*)world_create;
- world->_destroy= (test_callback_fn*)world_destroy;
+ world->_destroy= (test_callback_
destroy_
fn*)world_destroy;
world->item._startup= (test_callback_fn*)world_test_startup;
world->item._flush= (test_callback_fn*)world_flush;
world->item._startup= (test_callback_fn*)world_test_startup;
world->item._flush= (test_callback_fn*)world_flush;
@@
-506,5
+508,5
@@
void get_world(Framework *world)
world->collection_startup= (test_callback_fn*)world_container_startup;
world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
world->collection_startup= (test_callback_fn*)world_container_startup;
world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
- world->
runner= &defualt_libmemcached_runner
;
+ world->
set_runner(&defualt_libmemcached_runner)
;
}
}