projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for close on exec for socket.
[m6w6/libmemcached]
/
libtest
/
unittest.cc
diff --git
a/libtest/unittest.cc
b/libtest/unittest.cc
index c27f366a8b5670ce56a081fb421ab56b15063d2b..56df76ba1e5853769c379ee1cd76e6b4feb95253 100644
(file)
--- a/
libtest/unittest.cc
+++ b/
libtest/unittest.cc
@@
-265,10
+265,10
@@
static test_return_t drizzled_cycle_test(void *object)
test_true(servers and servers->validate());
#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
test_true(servers and servers->validate());
#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
- test_true(has_drizzled
_binary
());
+ test_true(has_drizzled());
#endif
#endif
- test_skip(true, has_drizzled
_binary
());
+ test_skip(true, has_drizzled());
test_true(server_startup(*servers, "drizzled", get_free_port(), 0, NULL));
test_true(server_startup(*servers, "drizzled", get_free_port(), 0, NULL));
@@
-281,10
+281,10
@@
static test_return_t gearmand_cycle_test(void *object)
test_true(servers and servers->validate());
#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
test_true(servers and servers->validate());
#if defined(HAVE_GEARMAND_BINARY) && HAVE_GEARMAND_BINARY
- test_true(has_gearmand
_binary
());
+ test_true(has_gearmand());
#endif
#endif
- test_skip(true, has_gearmand
_binary
());
+ test_skip(true, has_gearmand());
test_true(server_startup(*servers, "gearmand", get_free_port(), 0, NULL));
test_true(server_startup(*servers, "gearmand", get_free_port(), 0, NULL));
@@
-333,7
+333,7
@@
static test_return_t memcached_cycle_test(void *object)
if (MEMCACHED_BINARY and HAVE_LIBMEMCACHED)
{
if (MEMCACHED_BINARY and HAVE_LIBMEMCACHED)
{
- test_true(has_memcached
_binary
());
+ test_true(has_memcached());
test_true(server_startup(*servers, "memcached", get_free_port(), 0, NULL));
return TEST_SUCCESS;
test_true(server_startup(*servers, "memcached", get_free_port(), 0, NULL));
return TEST_SUCCESS;
@@
-351,7
+351,7
@@
static test_return_t memcached_socket_cycle_test(void *object)
{
if (HAVE_LIBMEMCACHED)
{
{
if (HAVE_LIBMEMCACHED)
{
- test_true(has_memcached
_binary
());
+ test_true(has_memcached());
test_true(servers->start_socket_server("memcached", get_free_port(), 0, NULL));
return TEST_SUCCESS;
test_true(servers->start_socket_server("memcached", get_free_port(), 0, NULL));
return TEST_SUCCESS;
@@
-372,7
+372,7
@@
static test_return_t memcached_sasl_test(void *object)
{
if (HAVE_LIBMEMCACHED)
{
{
if (HAVE_LIBMEMCACHED)
{
- test_true(has_memcached_sasl
_binary
());
+ test_true(has_memcached_sasl());
test_true(server_startup(*servers, "memcached-sasl", get_free_port(), 0, NULL));
return TEST_SUCCESS;
test_true(server_startup(*servers, "memcached-sasl", get_free_port(), 0, NULL));
return TEST_SUCCESS;
@@
-757,14
+757,14
@@
static test_return_t default_port_TEST(void *)
static test_return_t check_for_gearman(void *)
{
test_skip(true, HAVE_LIBGEARMAN);
static test_return_t check_for_gearman(void *)
{
test_skip(true, HAVE_LIBGEARMAN);
- test_skip(true, has_gearmand
_binary
());
+ test_skip(true, has_gearmand());
return TEST_SUCCESS;
}
static test_return_t check_for_drizzle(void *)
{
test_skip(true, HAVE_LIBDRIZZLE);
return TEST_SUCCESS;
}
static test_return_t check_for_drizzle(void *)
{
test_skip(true, HAVE_LIBDRIZZLE);
- test_skip(true, has_drizzled
_binary
());
+ test_skip(true, has_drizzled());
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-786,7
+786,7
@@
test_st gearmand_tests[] ={
static test_return_t check_for_libmemcached(void *)
{
test_skip(true, HAVE_LIBMEMCACHED);
static test_return_t check_for_libmemcached(void *)
{
test_skip(true, HAVE_LIBMEMCACHED);
- test_skip(true, has_memcached
_binary
());
+ test_skip(true, has_memcached());
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}