projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
tests: honor EPIPE in kill(HUP) test
[awesomized/libmemcached]
/
tests
/
memflush.cc
diff --git
a/tests/memflush.cc
b/tests/memflush.cc
index 5339f4e26845017bdebea9c12f997e79d8f65c0c..c197b4903956c8ada4969e9c0229e68145af0c3d 100644
(file)
--- a/
tests/memflush.cc
+++ b/
tests/memflush.cc
@@
-39,10
+39,10
@@
Test that we are cycling the servers we are creating during testing.
*/
Test that we are cycling the servers we are creating during testing.
*/
-#include <config.h>
+#include <
mem_
config.h>
#include <libtest/test.hpp>
#include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached
-1.0
/memcached.h>
using namespace libtest;
using namespace libtest;
@@
-95,26
+95,25
@@
collection_st collection[] ={
static void *world_create(server_startup_st& servers, test_return_t& error)
{
static void *world_create(server_startup_st& servers, test_return_t& error)
{
- if (
HAVE_MEMCACHED_BINARY == 0
)
+ if (
libtest::has_memcached() == false
)
{
error= TEST_SKIPPED;
return NULL;
}
{
error= TEST_SKIPPED;
return NULL;
}
- const char *argv[1]= { "memflush" };
- if (not server_startup(servers, "memcached", libtest::get_free_port(), 1, argv))
+ if (server_startup(servers, "memcached", libtest::default_port(), NULL) == 0)
{
{
- error= TEST_
FAILURE
;
+ error= TEST_
SKIPPED
;
}
return &servers;
}
}
return &servers;
}
-void get_world(
Framework *
world)
+void get_world(
libtest::Framework*
world)
{
executable= "./clients/memflush";
{
executable= "./clients/memflush";
- world->collections
= collection
;
- world->
_create= world_create
;
+ world->collections
(collection)
;
+ world->
create(world_create)
;
}
}