Merge in docs.

[m6w6/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index 7451efd3f6a84e6d90741d4da62d1e680fb37186..abcc0f333e27da3f28ad28cff20db11744b49e69 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -13,7 +13,7 @@ TESTS_LDADDS= \
              libtest/libserver.la \
              libtest/libtest.la
 
-VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --track-fds=yes
+VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
@@ -35,6 +35,8 @@ noinst_HEADERS+= \
                 tests/ketama_test_cases_spy.h \
                 tests/libmemcached_world.h \
                 tests/parser.h \
+                tests/deprecated.h \
+                tests/pool.h \
                 tests/print.h \
                 tests/replication.h \
                 tests/string.h \
@@ -53,41 +55,44 @@ noinst_PROGRAMS+= \
 tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testapp_SOURCES= \
                       tests/basic.cc \
+                      tests/deprecated.cc \
                       tests/error_conditions.cc \
-                      tests/mem_functions.c \
+                      tests/mem_functions.cc \
                       tests/parser.cc \
+                      tests/pool.cc \
                       tests/print.cc \
                       tests/replication.cc \
                       tests/string.cc \
                       tests/virtual_buckets.cc
+tests_testapp_SOURCES+= clients/generator.cc clients/execute.cc
 
 tests_testapp_DEPENDENCIES= \
                            $(BUILT_SOURCES) \
-                           clients/libgenexec.la \
-                           libmemcached/libmemcachedinternal.la \
-                           $(TESTS_LDADDS)
+                           $(TESTS_LDADDS) \
+                           libhashkit/libhashkit.la \
+                           libmemcached/libmemcachedinternal.la
 
-tests_testapp_LDADD= clients/libgenexec.la \
-                    libmemcached/libmemcachedinternal.la \
-                    $(TESTS_LDADDS) $(LIBSASL)
+tests_testapp_LDADD= \
+                    $(LIBSASL) \
+                    $(TESTS_LDADDS) \
+                    libhashkit/libhashkit.la \
+                    libmemcached/libmemcachedinternal.la
 
 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) $(LIBSASL)
+check_PROGRAMS+= tests/testplus
 
 tests_atomsmasher_SOURCES= tests/atomsmasher.c
-tests_atomsmasher_DEPENDENCIES= \
-                               clients/libgenexec.la \
-                               $(TESTS_LDADDS)
+tests_atomsmasher_SOURCES+= clients/generator.cc clients/execute.cc
+tests_atomsmasher_DEPENDENCIES= $(TESTS_LDADDS)
 
 tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) $(LIBSASL)
 
 tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testudp_SOURCES= tests/mem_udp.c
-tests_testudp_DEPENDENCIES= \
-                           clients/libgenexec.la \
-                           $(TESTS_LDADDS)
+tests_testudp_DEPENDENCIES= $(TESTS_LDADDS)
 
 tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL)
 
@@ -97,17 +102,17 @@ tests_startservers_LDADD= $(tests_startservers_DEPENDENCIES) $(LIBSASL)
 
 tests_testhashkit_SOURCES = tests/hashkit_functions.c
 tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la
-tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
+tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES)
 
-tests_hash_plus_SOURCES = tests/hash_plus.cc
-tests_hash_plus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_hash_plus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES)
-tests_hash_plus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
+tests_hash_plus_SOURCES= tests/hash_plus.cc
+tests_hash_plus_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_hash_plus_DEPENDENCIES= $(tests_testhashkit_DEPENDENCIES)
+tests_hash_plus_LDADD= $(tests_testhashkit_DEPENDENCIES)
 check_PROGRAMS+= tests/hash_plus
 
 test: check
 
-check-local: $(TEST_DOCS) test-mem test-hash memcapable
+check-local: tests/var $(TEST_DOCS) test-mem test-hash memcapable
        @echo "Tests completed"
 
 test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
@@ -241,7 +246,7 @@ UDP_COMMAND= tests/testudp $(COLLECTION) $(SUITE)
 
 HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
 
-test-mem: tests/testapp support/example.cnf
+test-mem: tests/testapp
        $(MEM_COMMAND)
 
 test-udp: tests/testudp