projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Adding in updated docs.
[m6w6/libmemcached]
/
tests
/
memslap.cc
diff --git
a/tests/memslap.cc
b/tests/memslap.cc
index 45bb6e5bb64e80e7100419319ee5d0be6eeaa5b6..229a920cd27ff7ba197e84a72330270f78ede60c 100644
(file)
--- a/
tests/memslap.cc
+++ b/
tests/memslap.cc
@@
-52,11
+52,19
@@
using namespace libtest;
static std::string executable;
static std::string executable;
+static test_return_t quiet_test(void *)
+{
+ const char *args[]= { "--quiet", 0 };
+
+ test_true(exec_cmdline(executable, args));
+ return TEST_SUCCESS;
+}
+
static test_return_t help_test(void *)
{
static test_return_t help_test(void *)
{
- const char *args[]= { "--help", 0 };
+ const char *args[]= { "--
quiet", "--
help", 0 };
- test_
success
(exec_cmdline(executable, args));
+ test_
true
(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-64,9
+72,9
@@
static test_return_t server_test(void *)
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { buffer, 0 };
+ const char *args[]= {
"--quiet",
buffer, 0 };
- test_
success
(exec_cmdline(executable, args));
+ test_
true
(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-74,9
+82,9
@@
static test_return_t server_concurrency_test(void *)
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { buffer, "--concurrency=10", 0 };
+ const char *args[]= {
"--quiet",
buffer, "--concurrency=10", 0 };
- test_
success
(exec_cmdline(executable, args));
+ test_
true
(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-84,9
+92,9
@@
static test_return_t server_concurrency_initial_load_test(void *)
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { buffer, "--concurrency=10", "--initial-load=1000", 0 };
+ const char *args[]= {
"--quiet",
buffer, "--concurrency=10", "--initial-load=1000", 0 };
- test_
success
(exec_cmdline(executable, args));
+ test_
true
(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-94,9
+102,9
@@
static test_return_t server_concurrency_initial_load_execute_number_test(void *)
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { buffer, "--concurrency=10", "--initial-load=1000", "--execute-number=10", 0 };
+ const char *args[]= {
"--quiet",
buffer, "--concurrency=10", "--initial-load=1000", "--execute-number=10", 0 };
- test_
success
(exec_cmdline(executable, args));
+ test_
true
(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-104,9
+112,9
@@
static test_return_t server_concurrency_initial_load_execute_number_test_get_tes
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { buffer, "--concurrency=10", "--initial-load=1000", "--execute-number=10", "--test=get", 0 };
+ const char *args[]= {
"--quiet",
buffer, "--concurrency=10", "--initial-load=1000", "--execute-number=10", "--test=get", 0 };
- test_
success
(exec_cmdline(executable, args));
+ test_
true
(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-114,9
+122,9
@@
static test_return_t server_concurrency_initial_load_execute_number_test_set_tes
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { buffer, "--concurrency=10", "--initial-load=1000", "--execute-number=10", "--test=set", 0 };
+ const char *args[]= {
"--quiet",
buffer, "--concurrency=10", "--initial-load=1000", "--execute-number=10", "--test=set", 0 };
- test_
success
(exec_cmdline(executable, args));
+ test_
true
(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-124,13
+132,14
@@
static test_return_t server_concurrency_initial_load_execute_number_test_set_non
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
{
char buffer[1024];
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
- const char *args[]= { buffer, "--concurrency=10", "--initial-load=1000", "--execute-number=10", "--test=set", "--non-blocking", 0 };
+ const char *args[]= {
"--quiet",
buffer, "--concurrency=10", "--initial-load=1000", "--execute-number=10", "--test=set", "--non-blocking", 0 };
- test_
success
(exec_cmdline(executable, args));
+ test_
true
(exec_cmdline(executable, args));
return TEST_SUCCESS;
}
test_st memslap_tests[] ={
return TEST_SUCCESS;
}
test_st memslap_tests[] ={
+ {"--quiet", true, quiet_test },
{"--help", true, help_test },
{"--server_test", true, server_test },
{"--concurrency=10", true, server_concurrency_test },
{"--help", true, help_test },
{"--server_test", true, server_test },
{"--concurrency=10", true, server_concurrency_test },
@@
-149,6
+158,12
@@
collection_st collection[] ={
static void *world_create(server_startup_st& servers, test_return_t& error)
{
static void *world_create(server_startup_st& servers, test_return_t& error)
{
+ if (HAVE_MEMCACHED_BINARY == 0)
+ {
+ error= TEST_FATAL;
+ return NULL;
+ }
+
const char *argv[1]= { "memslap" };
if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
{
const char *argv[1]= { "memslap" };
if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
{