projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-63
[awesomized/libmemcached]
/
tests
/
memcat.cc
diff --git
a/tests/memcat.cc
b/tests/memcat.cc
index bb496a1e56122b5e3ff2a89a7c2a32653eea8900..ed606d1dfbb4e8e234a0f71d04bd52fb2724e05b 100644
(file)
--- a/
tests/memcat.cc
+++ b/
tests/memcat.cc
@@
-42,7
+42,7
@@
#include <config.h>
#include <libtest/test.hpp>
#include <config.h>
#include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
+#include <libmemcached
-1.0
/memcached.h>
using namespace libtest;
using namespace libtest;
@@
-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/memcat");
static test_return_t help_test(void *)
{
static test_return_t help_test(void *)
{
@@
-122,7
+113,6
@@
static test_return_t NOT_FOUND_test(void *)
}
test_st memcat_tests[] ={
}
test_st memcat_tests[] ={
- {"--quiet", true, quiet_test },
{"--help", true, help_test },
{"cat(FOUND)", true, cat_test },
{"cat(NOT_FOUND)", true, NOT_FOUND_test },
{"--help", true, help_test },
{"cat(FOUND)", true, cat_test },
{"cat(NOT_FOUND)", true, NOT_FOUND_test },
@@
-136,14
+126,13
@@
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_SKIPPED;
return NULL;
}
{
error= TEST_SKIPPED;
return NULL;
}
- const char *argv[1]= { "memcat" };
- if (not server_startup(servers, "memcached", libtest::get_free_port(), 1, argv))
+ if (not server_startup(servers, "memcached", libtest::default_port(), 0, NULL))
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}
@@
-152,10
+141,9
@@
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/memcat";
- world->collections= collection;
- world->_create= world_create;
+ world->collections(collection);
+ world->create(world_create);
}
}