projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Update from latest ddm4
[awesomized/libmemcached]
/
tests
/
memerror.cc
diff --git
a/tests/memerror.cc
b/tests/memerror.cc
index 00863475838620c3d9639029062737b566ebacb0..76cc96c434570134387a79d112b478a2b8164064 100644
(file)
--- a/
tests/memerror.cc
+++ b/
tests/memerror.cc
@@
-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;
+static std::string executable
("./clients/memerror")
;
static test_return_t help_TEST(void *)
{
static test_return_t help_TEST(void *)
{
@@
-111,16
+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)
{
{
- executable= "./clients/memerror";
- world->collections= collection;
- world->_create= world_create;
+ world->collections(collection);
+ world->create(world_create);
}
}