projects
/
awesomized
/
libmemcached
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
|
github
raw
|
patch
|
inline
| side by side (parent:
d75ea57
)
Fix Debian issues.
author
Brian Aker
<brian@tangent.org>
Sat, 20 Apr 2013 04:14:00 +0000
(21:14 -0700)
committer
Brian Aker
<brian@tangent.org>
Sat, 20 Apr 2013 04:14:00 +0000
(21:14 -0700)
libtest/framework.cc
patch
|
blob
|
history
libtest/framework.h
patch
|
blob
|
history
libtest/run.gdb
patch
|
blob
|
history
libtest/server_container.cc
patch
|
blob
|
history
tests/libmemcached-1.0/mem_functions.cc
patch
|
blob
|
history
diff --git
a/libtest/framework.cc
b/libtest/framework.cc
index 30f511afdbf484850dc5cb18125888e8f332040d..92aacfeea30a37f117efabfa514285b1ae9f50bb 100644
(file)
--- a/
libtest/framework.cc
+++ b/
libtest/framework.cc
@@
-68,7
+68,7
@@
Framework::Framework(libtest::SignalThread& signal_,
get_world(this);
}
get_world(this);
}
-void Framework::collections(collection_st
* collections_
)
+void Framework::collections(collection_st
collections_[]
)
{
for (collection_st *next= collections_; next and next->name; next++)
{
{
for (collection_st *next= collections_; next and next->name; next++)
{
diff --git
a/libtest/framework.h
b/libtest/framework.h
index 7a24466a5ab9c7254d8f4b3a3db4de2155e98a98..361779db7387b5778ac2da80fdc5894738adff3e 100644
(file)
--- a/
libtest/framework.h
+++ b/
libtest/framework.h
@@
-72,7
+72,7
@@
public:
_destroy= arg;
}
_destroy= arg;
}
- void collections(collection_st
* arg
);
+ void collections(collection_st
arg[]
);
void set_on_error(test_callback_error_fn *arg)
{
void set_on_error(test_callback_error_fn *arg)
{
diff --git
a/libtest/run.gdb
b/libtest/run.gdb
index 328ee8f0936cd9cd9ea369302ad2fb550c5e4f1f..25dcdd53843dfc5706e0272315f92c48e77dda4d 100644
(file)
--- a/
libtest/run.gdb
+++ b/
libtest/run.gdb
@@
-1,6
+1,6
@@
set logging on
set logging overwrite on
set environment LIBTEST_IN_GDB=1
set logging on
set logging overwrite on
set environment LIBTEST_IN_GDB=1
-set ASAN_OPTIONS=abort_on_error=1
+
#
set ASAN_OPTIONS=abort_on_error=1
run
thread apply all bt
run
thread apply all bt
diff --git
a/libtest/server_container.cc
b/libtest/server_container.cc
index 3a5a7a0e3eaf14eff0cb7da20c21384fb1b827ad..4e73a0e91d8344e3ba9a42b5edb81de4015ae954 100644
(file)
--- a/
libtest/server_container.cc
+++ b/
libtest/server_container.cc
@@
-215,9
+215,9
@@
libtest::Server* server_startup_st::create(const std::string& server_type, in_po
}
else if (server_type.compare("drizzled") == 0)
{
}
else if (server_type.compare("drizzled") == 0)
{
- if (
DRIZZLED_BINARY
)
+ if (
has_drizzled()
)
{
{
- if (
HAVE_LIBDRIZZLE
)
+ if (
has_libdrizzle()
)
{
server= build_drizzled("localhost", try_port);
}
{
server= build_drizzled("localhost", try_port);
}
@@
-225,8
+225,9
@@
libtest::Server* server_startup_st::create(const std::string& server_type, in_po
}
else if (server_type.compare("blobslap_worker") == 0)
{
}
else if (server_type.compare("blobslap_worker") == 0)
{
- if (
GEARMAND_BINARY
)
+ if (
has_gearmand()
)
{
{
+#ifdef GEARMAND_BLOBSLAP_WORKER
if (GEARMAND_BLOBSLAP_WORKER)
{
if (HAVE_LIBGEARMAN)
if (GEARMAND_BLOBSLAP_WORKER)
{
if (HAVE_LIBGEARMAN)
@@
-234,11
+235,12
@@
libtest::Server* server_startup_st::create(const std::string& server_type, in_po
server= build_blobslap_worker(try_port);
}
}
server= build_blobslap_worker(try_port);
}
}
+#endif // GEARMAND_BLOBSLAP_WORKER
}
}
else if (server_type.compare("memcached") == 0)
{
}
}
else if (server_type.compare("memcached") == 0)
{
- if (
HAVE_MEMCACHED_BINARY
)
+ if (
has_memcached()
)
{
server= build_memcached("localhost", try_port);
}
{
server= build_memcached("localhost", try_port);
}
@@
-327,7
+329,7
@@
bool server_startup_st::_start_server(const bool is_socket,
else
{
{
else
{
{
-#if
defined(DEBUG)
+#if
def DEBUG
if (DEBUG)
{
Outn();
if (DEBUG)
{
Outn();
diff --git
a/tests/libmemcached-1.0/mem_functions.cc
b/tests/libmemcached-1.0/mem_functions.cc
index eb74f00e4e9e9f56f2d6aba7f256f882aeec75a9..e50f5794318491c0e74c71161357411d7fa9932e 100644
(file)
--- a/
tests/libmemcached-1.0/mem_functions.cc
+++ b/
tests/libmemcached-1.0/mem_functions.cc
@@
-2838,7
+2838,7
@@
test_return_t ketama_TEST(memcached_st *)
test_compare(memcached_behavior_set(&memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5), MEMCACHED_SUCCESS);
test_compare(memcached_behavior_set(&memc, MEMCACHED_BEHAVIOR_KETAMA_HASH, MEMCACHED_HASH_MD5), MEMCACHED_SUCCESS);
- test_compare(memcached_
behavior_get(&memc, MEMCACHED_BEHAVIOR_KETAMA_HASH
), MEMCACHED_HASH_MD5);
+ test_compare(memcached_
hash_t(memcached_behavior_get(&memc, MEMCACHED_BEHAVIOR_KETAMA_HASH)
), MEMCACHED_HASH_MD5);
test_compare(memcached_behavior_set_distribution(&memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY), MEMCACHED_SUCCESS);
test_compare(memcached_behavior_set_distribution(&memc, MEMCACHED_DISTRIBUTION_CONSISTENT_KETAMA_SPY), MEMCACHED_SUCCESS);