projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build/ Build: jenkins-Libmemcached-222
[awesomized/libmemcached]
/
libtest
/
unittest.cc
diff --git
a/libtest/unittest.cc
b/libtest/unittest.cc
index 8cc8a65ff99d08823ca15d33c26a0bfa55ed4422..b96fea06486a311b6e00744b065dd02568c16448 100644
(file)
--- a/
libtest/unittest.cc
+++ b/
libtest/unittest.cc
@@
-111,7
+111,7
@@
static test_return_t test_throw_success_TEST(void *)
try {
_SUCCESS;
}
try {
_SUCCESS;
}
- catch (
libtest::__success
)
+ catch (
const libtest::__success&
)
{
return TEST_SUCCESS;
}
{
return TEST_SUCCESS;
}
@@
-128,7
+128,7
@@
static test_return_t test_throw_skip_macro_TEST(void *)
try {
SKIP_IF(true);
}
try {
SKIP_IF(true);
}
- catch (
libtest::__skipped e
)
+ catch (
const libtest::__skipped&
)
{
return TEST_SUCCESS;
}
{
return TEST_SUCCESS;
}
@@
-147,7
+147,7
@@
static test_return_t test_throw_skip_TEST(void *)
try {
throw libtest::__skipped(LIBYATL_DEFAULT_PARAM, "basic test");
}
try {
throw libtest::__skipped(LIBYATL_DEFAULT_PARAM, "basic test");
}
- catch (
libtest::__skipped e
)
+ catch (
const libtest::__skipped&
)
{
return TEST_SUCCESS;
}
{
return TEST_SUCCESS;
}
@@
-396,7
+396,7
@@
static test_return_t drizzled_cycle_test(void *object)
test_skip(true, has_drizzled());
test_skip(true, has_drizzled());
- test_skip(true, server_startup(*servers, "drizzled", get_free_port(),
0, NULL, false
));
+ test_skip(true, server_startup(*servers, "drizzled", get_free_port(),
NULL
));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-407,7
+407,7
@@
static test_return_t gearmand_cycle_test(void *object)
test_true(servers and servers->validate());
test_skip(true, has_gearmand());
test_true(servers and servers->validate());
test_skip(true, has_gearmand());
- test_skip(true, server_startup(*servers, "gearmand", get_free_port(),
0, NULL, false
));
+ test_skip(true, server_startup(*servers, "gearmand", get_free_port(),
NULL
));
servers->clear();
return TEST_SUCCESS;
servers->clear();
return TEST_SUCCESS;
@@
-442,7
+442,7
@@
static test_return_t server_startup_fail_TEST(void *object)
test_true(servers);
fatal::disable();
test_true(servers);
fatal::disable();
- ASSERT_EQ(servers->start_server(testing_service, LIBTEST_FAIL_PORT,
0, NULL, false
), true);
+ ASSERT_EQ(servers->start_server(testing_service, LIBTEST_FAIL_PORT,
NULL
), true);
fatal::enable();
return TEST_SUCCESS;
fatal::enable();
return TEST_SUCCESS;
@@
-453,7
+453,7
@@
static test_return_t server_startup_TEST(void *object)
server_startup_st *servers= (server_startup_st*)object;
test_true(servers);
server_startup_st *servers= (server_startup_st*)object;
test_true(servers);
- ASSERT_EQ(servers->start_server(testing_service, get_free_port(),
0, NULL, false
), true);
+ ASSERT_EQ(servers->start_server(testing_service, get_free_port(),
NULL
), true);
test_true(servers->last());
pid_t last_pid= servers->last()->pid();
test_true(servers->last());
pid_t last_pid= servers->last()->pid();
@@
-476,7
+476,7
@@
static test_return_t socket_server_startup_TEST(void *object)
server_startup_st *servers= (server_startup_st*)object;
test_true(servers);
server_startup_st *servers= (server_startup_st*)object;
test_true(servers);
- test_true(servers->start_socket_server(testing_service, get_free_port(),
0, NULL, false
));
+ test_true(servers->start_socket_server(testing_service, get_free_port(),
NULL
));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-494,7
+494,7
@@
static test_return_t memcached_sasl_test(void *object)
if (HAVE_LIBMEMCACHED)
{
test_true(has_memcached_sasl());
if (HAVE_LIBMEMCACHED)
{
test_true(has_memcached_sasl());
- test_true(server_startup(*servers, "memcached-sasl", get_free_port(),
0, NULL, false
));
+ test_true(server_startup(*servers, "memcached-sasl", get_free_port(),
NULL
));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-893,7
+893,7
@@
static test_return_t create_tmpfile_TEST(void *)
static test_return_t fatal_message_TEST(void *)
{
ASSERT_EQ(fatal_calls++, fatal::disabled_counter());
static test_return_t fatal_message_TEST(void *)
{
ASSERT_EQ(fatal_calls++, fatal::disabled_counter());
-
fatal_message
("Fatal test");
+
FATAL
("Fatal test");
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-932,7
+932,6
@@
static test_return_t check_for_gearman(void *)
static test_return_t check_for_drizzle(void *)
{
static test_return_t check_for_drizzle(void *)
{
- test_skip(true, HAVE_LIBDRIZZLE);
test_skip(true, has_drizzled());
testing_service= "drizzled";
test_skip(true, has_drizzled());
testing_service= "drizzled";
@@
-1108,6
+1107,7
@@
test_st application_tests[] ={
static test_return_t check_for_curl(void *)
{
static test_return_t check_for_curl(void *)
{
+ test_skip_valgrind();
test_skip(true, HAVE_LIBCURL);
return TEST_SUCCESS;
}
test_skip(true, HAVE_LIBCURL);
return TEST_SUCCESS;
}