projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge in build trunk.
[awesomized/libmemcached]
/
tests
/
libmemcached_world_socket.h
diff --git
a/tests/libmemcached_world_socket.h
b/tests/libmemcached_world_socket.h
index 3e410084de3844340bcdc3eafe20490d79aa158e..d867ef88ef9c6a3f553890cd63442ba120627764 100644
(file)
--- a/
tests/libmemcached_world_socket.h
+++ b/
tests/libmemcached_world_socket.h
@@
-68,18
+68,12
@@
static void *world_create(libtest::server_startup_st& servers, test_return_t& er
const char *argv[1]= { "memcached" };
if (not servers.start_socket_server("memcached", libtest::get_free_port(), 1, argv))
{
const char *argv[1]= { "memcached" };
if (not servers.start_socket_server("memcached", libtest::get_free_port(), 1, argv))
{
- error= TEST_FATAL;
- return NULL;
+ fatal_message("Could not launch memcached");
}
}
libmemcached_test_container_st *global_container= new libmemcached_test_container_st(servers);
}
}
libmemcached_test_container_st *global_container= new libmemcached_test_container_st(servers);
- if (global_container == NULL)
- {
- error= TEST_MEMORY_ALLOCATION_FAILURE;
- return NULL;
- }
error= TEST_SUCCESS;
error= TEST_SUCCESS;