X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=abcc0f333e27da3f28ad28cff20db11744b49e69;hb=9f7b73d459c70cbed3bbc29b1fef626eb4cf6f3c;hp=490ed023d527adcb1a6c28a7a47eb9ad8cfd2a95;hpb=abc87c2867661669e897142dbfd531e32a14981b;p=awesomized%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index 490ed023..abcc0f33 100644
--- 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 \
@@ -43,8 +45,7 @@ noinst_HEADERS+= \
 
 noinst_PROGRAMS+= \
 		  tests/atomsmasher \
-		  tests/hashplus \
-		  tests/memplus \
+		  tests/hash_plus \
 		  tests/startservers \
 		  tests/testapp \
 		  tests/testhashkit \
@@ -54,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)
 
@@ -98,21 +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_hashplus_SOURCES = tests/hash_plus.cc
-tests_hashplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_hashplus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES)
-tests_hashplus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
-
-tests_memplus_SOURCES = tests/mem_plus.cc
-tests_memplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memplus_DEPENDENCIES = $(TESTS_LDADDS)
-tests_memplus_LDADD = $(tests_memplus_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
@@ -238,8 +238,6 @@ MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
 
 TESTPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
 
-MEMPLUS_COMMAND= tests/memplus $(COLLECTION) $(SUITE)
-
 HASHPLUS_COMMAND= tests/hashplus $(COLLECTION) $(SUITE)
 
 ATOM_COMMAND= tests/atomsmasher $(COLLECTION) $(SUITE)
@@ -248,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
@@ -266,9 +264,6 @@ test-hash: tests/testhashkit
 test-hashplus: tests/hashplus
 	$(HASHPLUS_COMMAND)
 
-test-memplus: tests/memplus
-	$(MEMPLUS_COMMAND)
-
 pahole-mem: tests/testapp
 	$(PAHOLE_COMMAND)  $(MEM_COMMAND)
 
@@ -290,9 +285,6 @@ gdb-hash: tests/testhashkit
 gdb-hashplus: tests/hashplus
 	$(DEBUG_COMMAND) $(HASHPLUS_COMMAND)
 
-gdb-memplus: tests/memplus
-	$(DEBUG_COMMAND) $(MEMPLUS_COMMAND)
-
 gdb-memslap: clients/memslap
 	$(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
 
@@ -314,9 +306,6 @@ valgrind-hash: tests/testhashkit
 valgrind-hashplus: tests/hashplus
 	$(VALGRIND_COMMAND) $(HASHPLUS_COMMAND)
 
-valgrind-memplus: tests/memplus
-	$(VALGRIND_COMMAND) $(MEMPLUS_COMMAND)
-
 valgrind-memslap: clients/memslap
 	$(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)