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-66
[awesomized/libmemcached]
/
tests
/
memtouch.cc
diff --git
a/tests/memtouch.cc
b/tests/memtouch.cc
index fa65e8b413ff85c25437eb5efbc249cda6435fe2..207ac1dc5c45ba71471ad726b4b3be006caa8146 100644
(file)
--- a/
tests/memtouch.cc
+++ b/
tests/memtouch.cc
@@
-42,8
+42,8
@@
#include <config.h>
#include <libtest/test.hpp>
#include <config.h>
#include <libtest/test.hpp>
-#include <libmemcached/memcached.h>
-#include <libmemcached/util.h>
+#include <libmemcached
-1.0
/memcached.h>
+#include <libmemcached
util-1.0
/util.h>
using namespace libtest;
using namespace libtest;
@@
-139,7
+139,7
@@
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;
@@
-147,17
+147,16
@@
static void *world_create(server_startup_st& servers, test_return_t& error)
if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
{
if (server_startup(servers, "memcached", libtest::default_port(), 0, NULL) == false)
{
- error= TEST_
FAILURE
;
+ error= TEST_
SKIPPED
;
}
return &servers;
}
}
return &servers;
}
-void get_world(
Framework *
world)
+void get_world(
libtest::Framework*
world)
{
executable= "./clients/memtouch";
{
executable= "./clients/memtouch";
- world->collections
= collection
;
- world->
_create= world_create
;
+ world->collections
(collection)
;
+ world->
create(world_create)
;
}
}
-