projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
flush
[awesomized/libmemcached]
/
tests
/
memerror.cc
diff --git
a/tests/memerror.cc
b/tests/memerror.cc
index 914d2a03b4df6ced19d0196503023c68579e161f..816ef9de2f347212e6d824e2e830738fbe142a63 100644
(file)
--- a/
tests/memerror.cc
+++ b/
tests/memerror.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
<libmemcached/memcached.h>
+#include
"libtest/test.hpp"
+#include
"libmemcached-1.0/memcached.h"
using namespace libtest;
using namespace libtest;
@@
-50,7
+50,7
@@
using namespace libtest;
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
#pragma GCC diagnostic ignored "-Wstrict-aliasing"
#endif
-static std::string executable("./
clients
/memerror");
+static std::string executable("./
src/bin
/memerror");
static test_return_t help_TEST(void *)
{
static test_return_t help_TEST(void *)
{
@@
-111,15
+111,21
@@
collection_st collection[] ={
{0, 0, 0, 0}
};
{0, 0, 0, 0}
};
-static void *world_create(server_startup_st&, test_return_t&)
+static void *world_create(server_startup_st&, test_return_t&
error
)
{
{
+ if (libtest::has_memcached() == false)
+ {
+ error= TEST_SKIPPED;
+ return NULL;
+ }
+
return NULL;
}
return NULL;
}
-void get_world(
Framework *
world)
+void get_world(
libtest::Framework*
world)
{
{
- world->collections
= collection
;
- world->
_create= world_create
;
+ world->collections
(collection)
;
+ world->
create(world_create)
;
}
}