projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix Debian issues.
[awesomized/libmemcached]
/
tests
/
memdump.cc
diff --git
a/tests/memdump.cc
b/tests/memdump.cc
index 840c1a17fd63d6e078d7db1b4c576d702e866b89..a43a61240a0be4915d4de52219402415c24255f0 100644
(file)
--- a/
tests/memdump.cc
+++ b/
tests/memdump.cc
@@
-39,7
+39,7
@@
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 <libmemcached-1.0/memcached.h>
#include <libtest/test.hpp>
#include <libmemcached-1.0/memcached.h>
@@
-67,7
+67,7
@@
static test_return_t server_test(void *)
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
const char *args[]= { buffer, 0 };
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
const char *args[]= { buffer, 0 };
- test_
compare(EXIT_SUCCESS, exec_cmdline(executable, args, true)
);
+ test_
true(exec_cmdline(executable, args, true) <= EXIT_FAILURE
);
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-91,7
+91,7
@@
static test_return_t FOUND_test(void *)
test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
test_compare(MEMCACHED_SUCCESS, rc);
test_null(memcached_get(memc, test_literal_param("foo"), 0, 0, &rc));
test_compare(MEMCACHED_SUCCESS, rc);
- test_
compare(EXIT_SUCCESS, exec_cmdline(executable, args, true)
);
+ test_
true(exec_cmdline(executable, args, true) <= EXIT_FAILURE
);
memcached_free(memc);
memcached_free(memc);
@@
-118,9
+118,10
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
return NULL;
}
return NULL;
}
- if (server_startup(servers, "memcached", libtest::default_port(),
0,
NULL) == false)
+ if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
{
error= TEST_FAILURE;
{
error= TEST_FAILURE;
+ return NULL;
}
return &servers;
}
return &servers;