projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge for version.
[awesomized/libmemcached]
/
tests
/
cycle.cc
diff --git
a/tests/cycle.cc
b/tests/cycle.cc
index 04b00f704d37edb47fd8b0666edc7b980a2c8558..64d2b860355e217dc53ec59dcccea160c6654e2f 100644
(file)
--- a/
tests/cycle.cc
+++ b/
tests/cycle.cc
@@
-42,7
+42,7
@@
#include <config.h>
#include <libtest/test.hpp>
#include <config.h>
#include <libtest/test.hpp>
-#include <libmemcached/
common
.h>
+#include <libmemcached/
memcached
.h>
#include <libmemcached/is.h>
#include <libmemcached/util.h>
#include <libmemcached/is.h>
#include <libmemcached/util.h>
@@
-53,8
+53,6
@@
using namespace libtest;
using namespace libtest;
-#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
@@
-129,6
+127,7
@@
collection_st collection[] ={
};
};
+#define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10
#include "tests/libmemcached_world.h"
void get_world(Framework *world)
#include "tests/libmemcached_world.h"
void get_world(Framework *world)
@@
-148,5
+147,6
@@
void get_world(Framework *world)
world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
world->set_runner(&defualt_libmemcached_runner);
world->collection_shutdown= (test_callback_fn*)world_container_shutdown;
world->set_runner(&defualt_libmemcached_runner);
+ world->set_socket();
}
}