projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Add in better testing for gdb.
[awesomized/libmemcached]
/
tests
/
libmemcached_world.h
diff --git
a/tests/libmemcached_world.h
b/tests/libmemcached_world.h
index 0d3b57dff1a24b1a5006ebe5fe33c59dd013aece..181379868be7b48abe6d34b93df7499219040002 100644
(file)
--- a/
tests/libmemcached_world.h
+++ b/
tests/libmemcached_world.h
@@
-39,8
+39,6
@@
#pragma once
#pragma once
-#include <cassert>
-
/* The structure we use for the test system */
struct libmemcached_test_container_st
{
/* The structure we use for the test system */
struct libmemcached_test_container_st
{
@@
-78,47
+76,25
@@
static void *world_create(libtest::server_startup_st& servers, test_return_t& er
for (uint32_t x= 0; x < servers.count(); x++)
{
for (uint32_t x= 0; x < servers.count(); x++)
{
- char variable_buffer[1024];
- snprintf(variable_buffer, sizeof(variable_buffer), "LIBMEMCACHED_PORT_%u", x);
+ in_port_t port= libtest::get_free_port();
- in_port_t port;
- char *var;
- if ((var= getenv(variable_buffer)))
- {
- port= in_port_t(atoi(var));
- }
- else
- {
- port= in_port_t(libtest::get_free_port());
- }
-
- const char *argv[1]= { "memcached" };
if (servers.sasl())
{
if (servers.sasl())
{
- if (
not server_startup(servers, "memcached-sasl", port, 1, argv)
)
+ if (
server_startup(servers, "memcached-sasl", port, 0, NULL) == false
)
{
{
- error= TEST_FATAL;
- return NULL;
+ fatal_message("Could not start memcached-sasl");
}
}
else
{
}
}
else
{
- if (
not server_startup(servers, "memcached", port, 1, argv)
)
+ if (
server_startup(servers, "memcached", port, 0, NULL) == false
)
{
{
- error= TEST_FATAL;
- return NULL;
+ fatal_message("Could not start 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;
return global_container;
}
return global_container;
}