projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update spec file
[m6w6/libmemcached]
/
tests
/
memcp.cc
diff --git
a/tests/memcp.cc
b/tests/memcp.cc
index 698041e69043ae895deb9e83b7332004b5b8ce78..eab8cfa58a7d946d9b0d9c229404300a89e0cbed 100644
(file)
--- a/
tests/memcp.cc
+++ b/
tests/memcp.cc
@@
-50,16
+50,7
@@
using namespace libtest;
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
-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 std::string executable("./clients/memcp");
static test_return_t help_test(void *)
{
static test_return_t help_test(void *)
{
@@
-82,7
+73,6
@@
static test_return_t server_test(void *)
}
test_st memcp_tests[] ={
}
test_st memcp_tests[] ={
- {"--quiet", true, quiet_test },
{"--help", true, help_test },
{"--server_test", true, server_test },
{0, 0, 0}
{"--help", true, help_test },
{"--server_test", true, server_test },
{0, 0, 0}
@@
-101,8
+91,7
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
return NULL;
}
return NULL;
}
- const char *argv[1]= { "memcp" };
- if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
+ if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}
@@
-113,7
+102,6
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
void get_world(Framework *world)
{
void get_world(Framework *world)
{
- executable= "./clients/memcp";
world->collections= collection;
world->_create= world_create;
}
world->collections= collection;
world->_create= world_create;
}