projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
libmemcached: fix #53 with supplied patch
[m6w6/libmemcached]
/
tests
/
memcp.cc
diff --git
a/tests/memcp.cc
b/tests/memcp.cc
index 698041e69043ae895deb9e83b7332004b5b8ce78..7ce5a493e9f3287b56033488b5aaf1fb86b839ac 100644
(file)
--- a/
tests/memcp.cc
+++ b/
tests/memcp.cc
@@
-39,10
+39,12
@@
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>
+
+#include <sys/stat.h>
using namespace libtest;
using namespace libtest;
@@
-50,16
+52,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 *)
{
@@
-70,21
+63,33
@@
static test_return_t help_test(void *)
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
+#if 0
static test_return_t server_test(void *)
{
static test_return_t server_test(void *)
{
+ int fd;
+ std::string tmp_file= create_tmpfile("memcp", fd);
+ ASSERT_TRUE(tmp_file.c_str());
+ struct stat buf;
+ ASSERT_EQ(fstat(fd, &buf), 0);
+ ASSERT_EQ(buf.st_size, 0);
+
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[]= { buffer,
tmp_file.c_str(),
0 };
test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
test_compare(EXIT_SUCCESS, exec_cmdline(executable, args, true));
+ close(fd);
+ unlink(tmp_file.c_str());
return TEST_SUCCESS;
}
return TEST_SUCCESS;
}
+#endif
test_st memcp_tests[] ={
test_st memcp_tests[] ={
- {"--quiet", true, quiet_test },
{"--help", true, help_test },
{"--help", true, help_test },
+#if 0
{"--server_test", true, server_test },
{"--server_test", true, server_test },
+#endif
{0, 0, 0}
};
{0, 0, 0}
};
@@
-95,14
+100,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]= { "memcp" };
- if (not server_startup(servers, "memcached", MEMCACHED_DEFAULT_PORT +10, 1, argv))
+ if (server_startup(servers, "memcached", libtest::default_port(), NULL) == false)
{
error= TEST_FAILURE;
}
{
error= TEST_FAILURE;
}
@@
-111,10
+115,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/memcp";
- world->collections= collection;
- world->_create= world_create;
+ world->collections(collection);
+ world->create(world_create);
}
}