projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
m4: fix multiple output
[awesomized/libmemcached]
/
tests
/
memslap.cc
diff --git
a/tests/memslap.cc
b/tests/memslap.cc
index 5063c559402579bdfd3e749d2a94113a82868ec8..8a1a5cba74a23c5f468284ecede35f9ac1c1a32c 100644
(file)
--- a/
tests/memslap.cc
+++ b/
tests/memslap.cc
@@
-39,10
+39,10
@@
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 <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached
-1.0
/memcached.h>
using namespace libtest;
using namespace libtest;
@@
-52,11
+52,21
@@
using namespace libtest;
static std::string executable;
static std::string executable;
+static test_return_t quiet_test(void *)
+{
+ const char *args[]= { "--quiet", 0 };
+
+ test_compare(EXIT_FAILURE, exec_cmdline(executable, args, true));
+
+ return TEST_SUCCESS;
+}
+
static test_return_t help_test(void *)
{
const char *args[]= { "--help", 0 };
static test_return_t help_test(void *)
{
const char *args[]= { "--help", 0 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-66,7
+76,8
@@
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_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-76,7
+87,8
@@
static test_return_t server_concurrency_test(void *)
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
const char *args[]= { buffer, "--concurrency=10", 0 };
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
const char *args[]= { buffer, "--concurrency=10", 0 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-86,7
+98,8
@@
static test_return_t server_concurrency_initial_load_test(void *)
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
const char *args[]= { buffer, "--concurrency=10", "--initial-load=1000", 0 };
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
const char *args[]= { buffer, "--concurrency=10", "--initial-load=1000", 0 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-96,7
+109,8
@@
static test_return_t server_concurrency_initial_load_execute_number_test(void *)
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
const char *args[]= { buffer, "--concurrency=10", "--initial-load=1000", "--execute-number=10", 0 };
snprintf(buffer, sizeof(buffer), "--servers=localhost:%d", int(default_port()));
const char *args[]= { buffer, "--concurrency=10", "--initial-load=1000", "--execute-number=10", 0 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-106,7
+120,8
@@
static test_return_t server_concurrency_initial_load_execute_number_test_get_tes
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 };
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 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-116,7
+131,8
@@
static test_return_t server_concurrency_initial_load_execute_number_test_set_tes
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 };
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 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
@@
-126,11
+142,13
@@
static test_return_t server_concurrency_initial_load_execute_number_test_set_non
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 };
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 };
- test_true(exec_cmdline(executable, args));
+ test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+
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,14
+167,14
@@
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
)
+ if (
libtest::has_memcached() == false
)
{
{
- error= TEST_
FATAL
;
+ error= TEST_
SKIPPED
;
return NULL;
}
return NULL;
}
- const char *argv[
1]= { "memslap"
};
- if (
not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv)
)
+ const char *argv[
]= { "memslap", 0
};
+ if (
server_startup(servers, "memcached", libtest::default_port(), argv) == false
)
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}
@@
-165,10
+183,10
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
}
}
-void get_world(
Framework *
world)
+void get_world(
libtest::Framework*
world)
{
executable= "./clients/memslap";
{
executable= "./clients/memslap";
- world->collections
= collection
;
- world->
_create= world_create
;
+ world->collections
(collection)
;
+ world->
create(world_create)
;
}
}