diff options
| -rw-r--r-- | .bzrignore | 4 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | libmemcached-1.2/configure.h.in | 52 | ||||
| -rw-r--r-- | libmemcached-1.2/error.h | 59 | ||||
| -rw-r--r-- | libmemcached-1.2/include.am | 12 | ||||
| -rw-r--r-- | libmemcached-1.2/memcached.h | 72 | ||||
| -rw-r--r-- | tests/include.am | 119 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/atomsmasher.cc (renamed from tests/atomsmasher.cc) | 2 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/basic.cc (renamed from tests/basic.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/callbacks.cc (renamed from tests/callbacks.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/debug.cc (renamed from tests/debug.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/deprecated.cc (renamed from tests/deprecated.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/error_conditions.cc (renamed from tests/error_conditions.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/exist.cc (renamed from tests/exist.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/include.am | 131 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/internals.cc (renamed from tests/internals.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/ketama.cc (renamed from tests/ketama.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/mem_functions.cc (renamed from tests/mem_functions.cc) | 2 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/namespace.cc (renamed from tests/namespace.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/parser.cc (renamed from tests/parser.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/plus.cpp (renamed from tests/plus.cpp) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/pool.cc (renamed from tests/pool.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/print.cc (renamed from tests/print.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/replication.cc (renamed from tests/replication.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/sasl.cc (renamed from tests/sasl.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/server_add.cc (renamed from tests/server_add.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/string.cc (renamed from tests/string.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/touch.cc (renamed from tests/touch.cc) | 0 | ||||
| -rw-r--r-- | tests/libmemcached-1.0/virtual_buckets.cc (renamed from tests/virtual_buckets.cc) | 0 |
29 files changed, 335 insertions, 119 deletions
@@ -133,3 +133,7 @@ tests/memexist libmemcached/configure.h clients/memtouch tests/memtouch +libmemcached-1.2/configure.h +tests/libmemcached-1.0/internals +tests/libmemcached-1.0/sasl +tests/libmemcached-1.0/testapp diff --git a/configure.ac b/configure.ac index c1b4b222..24930621 100644 --- a/configure.ac +++ b/configure.ac @@ -190,6 +190,7 @@ AC_CONFIG_FILES([ docs/conf.py libhashkit-1.0/configure.h libmemcached-1.0/configure.h + libmemcached-1.2/configure.h support/libmemcached.pc support/libmemcached.spec support/libmemcached-fc.spec diff --git a/libmemcached-1.2/configure.h.in b/libmemcached-1.2/configure.h.in new file mode 100644 index 00000000..7b48be2a --- /dev/null +++ b/libmemcached-1.2/configure.h.in @@ -0,0 +1,52 @@ +/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: + * + * Libmemcached library + * + * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * Copyright (C) 2006-2009 Brian Aker, Trond Norbye All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +@DEPRECATED@ +@LIBMEMCACHED_WITH_SASL_SUPPORT@ + +#define LIBMEMCACHED_VERSION_STRING "@VERSION@" +#define LIBMEMCACHED_VERSION_HEX @PANDORA_HEX_VERSION@ + +#ifdef __cplusplus +} +#endif diff --git a/libmemcached-1.2/error.h b/libmemcached-1.2/error.h new file mode 100644 index 00000000..52cc759f --- /dev/null +++ b/libmemcached-1.2/error.h @@ -0,0 +1,59 @@ +/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: + * + * LibMemcached + * + * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#pragma once + +#ifdef __cplusplus +extern "C" { +#endif + +LIBMEMCACHED_API + const char *memcached_last_error_message(memcached_st *); + +LIBMEMCACHED_API + memcached_return_t memcached_last_error(memcached_st *); + +LIBMEMCACHED_API + const char *memcached_server_last_error_message(memcached_instance_st *); + +LIBMEMCACHED_API + memcached_return_t memcached_server_last_error(memcached_instance_st *); + +#ifdef __cplusplus +} // extern "C" +#endif + diff --git a/libmemcached-1.2/include.am b/libmemcached-1.2/include.am new file mode 100644 index 00000000..fa537505 --- /dev/null +++ b/libmemcached-1.2/include.am @@ -0,0 +1,12 @@ +# vim:ft=automake +# included from Top Level Makefile.am +# All paths should be given relative to the root + +# This is not a public interface yet. + +EXTRA_DIST+= \ + libmemcached-1.2/configure.h.in + +noinst_HEADERS+= \ + libmemcached-1.2/memcached.h + diff --git a/libmemcached-1.2/memcached.h b/libmemcached-1.2/memcached.h new file mode 100644 index 00000000..ef2adf24 --- /dev/null +++ b/libmemcached-1.2/memcached.h @@ -0,0 +1,72 @@ +/* vim:expandtab:shiftwidth=2:tabstop=2:smarttab: + * + * Libmemcached library + * + * Copyright (C) 2011 Data Differential, http://datadifferential.com/ + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are + * met: + * + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following disclaimer + * in the documentation and/or other materials provided with the + * distribution. + * + * * The names of its contributors may not be used to endorse or + * promote products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#pragma once + +#include <inttypes.h> +#include <stdlib.h> +#include <sys/types.h> + + +#if !defined(__cplusplus) +# include <stdbool.h> +#endif + +#include <libmemcached-1.0/visibility.h> +#include <libmemcached-1.0/error.h> + +#ifdef __cplusplus +extern "C" { +#endif + +LIBMEMCACHED_API +memcached_st *memcached(const char *string, size_t string_length); + +LIBMEMCACHED_API +void memcached_free(memcached_st *ptr); + +LIBMEMCACHED_API +memcached_st *memcached_clone(memcached_st *destination, const memcached_st *source); + +LIBMEMCACHED_API +void *memcached_get_user_data(const memcached_st *ptr); + +LIBMEMCACHED_API +void *memcached_set_user_data(memcached_st *ptr, void *data); + +#ifdef __cplusplus +} // extern "C" +#endif diff --git a/tests/include.am b/tests/include.am index e21afbb7..2673ea24 100644 --- a/tests/include.am +++ b/tests/include.am @@ -22,26 +22,8 @@ EXTRA_DIST+= \ tests/output_plus.res noinst_HEADERS+= \ - tests/basic.h \ - tests/callbacks.h \ - tests/debug.h \ - tests/error_conditions.h \ tests/exist.h \ - tests/hash_results.h \ - tests/ketama.h \ - tests/ketama_test_cases.h \ - tests/ketama_test_cases_spy.h \ - tests/libmemcached_world.h \ - tests/namespace.h \ - tests/parser.h \ - tests/touch.h \ - tests/deprecated.h \ - tests/pool.h \ - tests/print.h \ - tests/replication.h \ - tests/server_add.h \ - tests/string.h \ - tests/virtual_buckets.h + tests/libmemcached_world.h # Cycle should always run first tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) @@ -54,87 +36,7 @@ tests_cycle_LDADD+= ${PTHREAD_LIBS} check_PROGRAMS+= tests/cycle noinst_PROGRAMS+= tests/cycle -# Test internals -tests_internals_SOURCES= tests/internals.cc -tests_internals_SOURCES+= tests/string.cc -tests_internals_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS} -tests_internals_DEPENDENCIES= libmemcachedinternal/libmemcachedinternal.la libtest/libtest.la libmemcachedinternal/libmemcachedutilinternal.la -tests_internals_LDADD= libmemcachedinternal/libmemcachedinternal.la -tests_internals_LDADD+= ${PTHREAD_LIBS} -tests_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la -tests_internals_LDADD+= libtest/libtest.la -check_PROGRAMS+= tests/internals -noinst_PROGRAMS+= tests/internals - - -tests_testapp_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS} -tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) -tests_testapp_SOURCES= \ - tests/basic.cc \ - tests/debug.cc \ - tests/deprecated.cc \ - tests/error_conditions.cc \ - tests/exist.cc \ - tests/ketama.cc \ - tests/mem_functions.cc \ - tests/namespace.cc \ - tests/parser.cc \ - tests/touch.cc \ - tests/callbacks.cc \ - tests/pool.cc \ - tests/print.cc \ - tests/replication.cc \ - tests/server_add.cc \ - tests/virtual_buckets.cc -tests_testapp_SOURCES+= clients/generator.cc clients/execute.cc -tests_testapp_DEPENDENCIES= \ - libmemcached/libmemcached.la \ - libtest/libtest.la - libhashkit/libhashkit.la \ - libmemcached/libmemcachedutil.la -tests_testapp_LDADD= \ - ${PTHREAD_LIBS} \ - libmemcached/libmemcached.la \ - libmemcached/libmemcachedutil.la \ - libtest/libtest.la \ - libhashkit/libhashkit.la -check_PROGRAMS+= tests/testapp -noinst_PROGRAMS+= tests/testapp - -tests_sasl_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS} -tests_sasl_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) -tests_sasl_SOURCES= \ - tests/basic.cc \ - tests/debug.cc \ - tests/deprecated.cc \ - tests/error_conditions.cc \ - tests/ketama.cc \ - tests/sasl.cc \ - tests/namespace.cc \ - tests/parser.cc \ - tests/pool.cc \ - tests/print.cc \ - tests/replication.cc \ - tests/virtual_buckets.cc -tests_sasl_SOURCES+= clients/generator.cc clients/execute.cc -tests_sasl_DEPENDENCIES= \ - libmemcached/libmemcached.la \ - libtest/libtest.la -tests_sasl_LDADD= \ - ${PTHREAD_LIBS} \ - libmemcached/libmemcached.la \ - libmemcached/libmemcachedutil.la \ - libtest/libtest.la \ - libhashkit/libhashkit.la -check_PROGRAMS+= tests/sasl -noinst_PROGRAMS+= tests/sasl - -tests_testplus_SOURCES= tests/plus.cpp -tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_testplus_DEPENDENCIES= $(TESTS_LDADDS) -tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) -check_PROGRAMS+= tests/testplus -noinst_PROGRAMS+= tests/testplus +include tests/libmemcached-1.0/include.am tests_failure_SOURCES= tests/failure.cc tests_failure_CXXFLAGS = $(AM_CXXFLAGS) @@ -143,23 +45,6 @@ tests_failure_LDADD= $(tests_failure_DEPENDENCIES) check_PROGRAMS+= tests/failure noinst_PROGRAMS+= tests/failure -tests_atomsmasher_SOURCES= \ - tests/atomsmasher.cc \ - tests/debug.cc \ - tests/print.cc \ - clients/generator.cc \ - clients/execute.cc -tests_atomsmasher_DEPENDENCIES= $(TESTS_LDADDS) -tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) -noinst_PROGRAMS+= tests/atomsmasher - -tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) -tests_testudp_SOURCES= tests/mem_udp.cc -tests_testudp_DEPENDENCIES= $(TESTS_LDADDS) -tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) -check_PROGRAMS+= tests/testudp -noinst_PROGRAMS+= tests/testudp - tests_testhashkit_SOURCES = tests/hashkit_functions.cc tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS) tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) diff --git a/tests/atomsmasher.cc b/tests/libmemcached-1.0/atomsmasher.cc index 981819d2..bab25d03 100644 --- a/tests/atomsmasher.cc +++ b/tests/libmemcached-1.0/atomsmasher.cc @@ -280,7 +280,7 @@ collection_st collection[] ={ #define TEST_PORT_BASE MEMCACHED_DEFAULT_PORT +10 -#include "libmemcached_world.h" +#include "tests/libmemcached_world.h" void get_world(Framework *world) { diff --git a/tests/basic.cc b/tests/libmemcached-1.0/basic.cc index 2c6cf8ee..2c6cf8ee 100644 --- a/tests/basic.cc +++ b/tests/libmemcached-1.0/basic.cc diff --git a/tests/callbacks.cc b/tests/libmemcached-1.0/callbacks.cc index 206e6092..206e6092 100644 --- a/tests/callbacks.cc +++ b/tests/libmemcached-1.0/callbacks.cc diff --git a/tests/debug.cc b/tests/libmemcached-1.0/debug.cc index 5e72a0b6..5e72a0b6 100644 --- a/tests/debug.cc +++ b/tests/libmemcached-1.0/debug.cc diff --git a/tests/deprecated.cc b/tests/libmemcached-1.0/deprecated.cc index e98faf40..e98faf40 100644 --- a/tests/deprecated.cc +++ b/tests/libmemcached-1.0/deprecated.cc diff --git a/tests/error_conditions.cc b/tests/libmemcached-1.0/error_conditions.cc index 66e7c44e..66e7c44e 100644 --- a/tests/error_conditions.cc +++ b/tests/libmemcached-1.0/error_conditions.cc diff --git a/tests/exist.cc b/tests/libmemcached-1.0/exist.cc index 7d1178ff..7d1178ff 100644 --- a/tests/exist.cc +++ b/tests/libmemcached-1.0/exist.cc diff --git a/tests/libmemcached-1.0/include.am b/tests/libmemcached-1.0/include.am new file mode 100644 index 00000000..29c02b32 --- /dev/null +++ b/tests/libmemcached-1.0/include.am @@ -0,0 +1,131 @@ +# vim:ft=automake +# Copyright (C) 2011 Data Differential +# All rights reserved. +# +# Use and distribution licensed under the BSD license. See +# the COPYING file in the parent directory for full text. +# +# included from Top Level Makefile.am +# All paths should be given relative to the root + +noinst_HEADERS+= \ + tests/basic.h \ + tests/callbacks.h \ + tests/debug.h \ + tests/error_conditions.h \ + tests/exist.h \ + tests/ketama.h \ + tests/ketama_test_cases.h \ + tests/ketama_test_cases_spy.h \ + tests/namespace.h \ + tests/parser.h \ + tests/touch.h \ + tests/deprecated.h \ + tests/pool.h \ + tests/print.h \ + tests/replication.h \ + tests/server_add.h \ + tests/string.h \ + tests/virtual_buckets.h + +# Test internals +tests_libmemcached_1_0_internals_SOURCES= tests/libmemcached-1.0/internals.cc +tests_libmemcached_1_0_internals_SOURCES+= tests/libmemcached-1.0/string.cc +tests_libmemcached_1_0_internals_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS} +tests_libmemcached_1_0_internals_DEPENDENCIES= libmemcachedinternal/libmemcachedinternal.la libtest/libtest.la libmemcachedinternal/libmemcachedutilinternal.la +tests_libmemcached_1_0_internals_LDADD= libmemcachedinternal/libmemcachedinternal.la +tests_libmemcached_1_0_internals_LDADD+= ${PTHREAD_LIBS} +tests_libmemcached_1_0_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la +tests_libmemcached_1_0_internals_LDADD+= libtest/libtest.la +check_PROGRAMS+= tests/libmemcached-1.0/internals +noinst_PROGRAMS+= tests/libmemcached-1.0/internals + + +tests_libmemcached_1_0_testapp_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS} +tests_libmemcached_1_0_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) +tests_libmemcached_1_0_testapp_SOURCES= \ + tests/libmemcached-1.0/basic.cc \ + tests/libmemcached-1.0/callbacks.cc \ + tests/libmemcached-1.0/debug.cc \ + tests/libmemcached-1.0/deprecated.cc \ + tests/libmemcached-1.0/error_conditions.cc \ + tests/libmemcached-1.0/exist.cc \ + tests/libmemcached-1.0/ketama.cc \ + tests/libmemcached-1.0/mem_functions.cc \ + tests/libmemcached-1.0/namespace.cc \ + tests/libmemcached-1.0/pool.cc \ + tests/libmemcached-1.0/print.cc \ + tests/libmemcached-1.0/replication.cc \ + tests/libmemcached-1.0/parser.cc \ + tests/libmemcached-1.0/server_add.cc \ + tests/libmemcached-1.0/touch.cc \ + tests/libmemcached-1.0/virtual_buckets.cc + +tests_libmemcached_1_0_testapp_SOURCES+= clients/generator.cc clients/execute.cc +tests_libmemcached_1_0_testapp_DEPENDENCIES= \ + libmemcached/libmemcached.la \ + libtest/libtest.la \ + libhashkit/libhashkit.la \ + libmemcached/libmemcachedutil.la + +tests_libmemcached_1_0_testapp_LDADD= \ + ${PTHREAD_LIBS} \ + libmemcached/libmemcached.la \ + libmemcached/libmemcachedutil.la \ + libtest/libtest.la \ + libhashkit/libhashkit.la + +check_PROGRAMS+= tests/libmemcached-1.0/testapp +noinst_PROGRAMS+= tests/libmemcached-1.0/testapp + +tests_libmemcached_1_0_sasl_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS} +tests_libmemcached_1_0_sasl_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) +tests_libmemcached_1_0_sasl_SOURCES= \ + tests/libmemcached-1.0/basic.cc \ + tests/libmemcached-1.0/debug.cc \ + tests/libmemcached-1.0/deprecated.cc \ + tests/libmemcached-1.0/error_conditions.cc \ + tests/libmemcached-1.0/ketama.cc \ + tests/libmemcached-1.0/namespace.cc \ + tests/libmemcached-1.0/parser.cc \ + tests/libmemcached-1.0/pool.cc \ + tests/libmemcached-1.0/print.cc \ + tests/libmemcached-1.0/replication.cc \ + tests/libmemcached-1.0/sasl.cc \ + tests/libmemcached-1.0/virtual_buckets.cc +tests_libmemcached_1_0_sasl_SOURCES+= clients/generator.cc clients/execute.cc +tests_libmemcached_1_0_sasl_DEPENDENCIES= \ + libmemcached/libmemcached.la \ + libtest/libtest.la +tests_libmemcached_1_0_sasl_LDADD= \ + ${PTHREAD_LIBS} \ + libmemcached/libmemcached.la \ + libmemcached/libmemcachedutil.la \ + libtest/libtest.la \ + libhashkit/libhashkit.la +check_PROGRAMS+= tests/libmemcached-1.0/sasl +noinst_PROGRAMS+= tests/libmemcached-1.0/sasl + +tests_atomsmasher_SOURCES= \ + tests/libmemcached-1.0/atomsmasher.cc \ + tests/libmemcached-1.0/debug.cc \ + tests/libmemcached-1.0/print.cc \ + clients/generator.cc \ + clients/execute.cc +tests_atomsmasher_DEPENDENCIES= $(TESTS_LDADDS) +tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) +noinst_PROGRAMS+= tests/atomsmasher + +tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) +tests_testudp_SOURCES= tests/mem_udp.cc +tests_testudp_DEPENDENCIES= $(TESTS_LDADDS) +tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) +check_PROGRAMS+= tests/testudp +noinst_PROGRAMS+= tests/testudp + +tests_testplus_SOURCES= tests/libmemcached-1.0/plus.cpp +tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX) +tests_testplus_DEPENDENCIES= $(TESTS_LDADDS) +tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) +check_PROGRAMS+= tests/testplus +noinst_PROGRAMS+= tests/testplus diff --git a/tests/internals.cc b/tests/libmemcached-1.0/internals.cc index 8c28d315..8c28d315 100644 --- a/tests/internals.cc +++ b/tests/libmemcached-1.0/internals.cc diff --git a/tests/ketama.cc b/tests/libmemcached-1.0/ketama.cc index 82237343..82237343 100644 --- a/tests/ketama.cc +++ b/tests/libmemcached-1.0/ketama.cc diff --git a/tests/mem_functions.cc b/tests/libmemcached-1.0/mem_functions.cc index c2fbdc32..cf021afe 100644 --- a/tests/mem_functions.cc +++ b/tests/libmemcached-1.0/mem_functions.cc @@ -90,7 +90,7 @@ using namespace libtest; #include <libmemcached/util.h> -#include "hash_results.h" +#include "tests/hash_results.h" #define GLOBAL_COUNT 10000 #define GLOBAL2_COUNT 100 diff --git a/tests/namespace.cc b/tests/libmemcached-1.0/namespace.cc index 57ecc606..57ecc606 100644 --- a/tests/namespace.cc +++ b/tests/libmemcached-1.0/namespace.cc diff --git a/tests/parser.cc b/tests/libmemcached-1.0/parser.cc index 32b0d9d8..32b0d9d8 100644 --- a/tests/parser.cc +++ b/tests/libmemcached-1.0/parser.cc diff --git a/tests/plus.cpp b/tests/libmemcached-1.0/plus.cpp index 5078f1f5..5078f1f5 100644 --- a/tests/plus.cpp +++ b/tests/libmemcached-1.0/plus.cpp diff --git a/tests/pool.cc b/tests/libmemcached-1.0/pool.cc index f6214e0d..f6214e0d 100644 --- a/tests/pool.cc +++ b/tests/libmemcached-1.0/pool.cc diff --git a/tests/print.cc b/tests/libmemcached-1.0/print.cc index 78926581..78926581 100644 --- a/tests/print.cc +++ b/tests/libmemcached-1.0/print.cc diff --git a/tests/replication.cc b/tests/libmemcached-1.0/replication.cc index be1fd7e2..be1fd7e2 100644 --- a/tests/replication.cc +++ b/tests/libmemcached-1.0/replication.cc diff --git a/tests/sasl.cc b/tests/libmemcached-1.0/sasl.cc index 70b42987..70b42987 100644 --- a/tests/sasl.cc +++ b/tests/libmemcached-1.0/sasl.cc diff --git a/tests/server_add.cc b/tests/libmemcached-1.0/server_add.cc index b343bf9c..b343bf9c 100644 --- a/tests/server_add.cc +++ b/tests/libmemcached-1.0/server_add.cc diff --git a/tests/string.cc b/tests/libmemcached-1.0/string.cc index bb90e94b..bb90e94b 100644 --- a/tests/string.cc +++ b/tests/libmemcached-1.0/string.cc diff --git a/tests/touch.cc b/tests/libmemcached-1.0/touch.cc index 50e6a359..50e6a359 100644 --- a/tests/touch.cc +++ b/tests/libmemcached-1.0/touch.cc diff --git a/tests/virtual_buckets.cc b/tests/libmemcached-1.0/virtual_buckets.cc index ec8225dc..ec8225dc 100644 --- a/tests/virtual_buckets.cc +++ b/tests/libmemcached-1.0/virtual_buckets.cc |