X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=7ce21a1279f394e3bc4dec93e2ced4431a68a981;hb=9fd31c03436acf24c593dc3a77c905eb137ef570;hp=44954b110ffe35d200c7b2dd9b0699dc1b2f72e7;hpb=67456d74f5bd4f354a360d70da503dc58cbe5971;p=awesomized%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index 44954b11..7ce21a12 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
 
@@ -57,25 +57,24 @@ 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) \
 			    $(TESTS_LDADDS) \
-			    clients/libgenexec.la \
 			    libhashkit/libhashkit.la \
 			    libmemcached/libmemcachedinternal.la
 
 tests_testapp_LDADD= \
 		     $(LIBSASL) \
 		     $(TESTS_LDADDS) \
-		     clients/libgenexec.la \
 		     libhashkit/libhashkit.la \
 		     libmemcached/libmemcachedinternal.la
 
@@ -85,26 +84,23 @@ 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= tests/atomsmasher.cc
+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_SOURCES= tests/mem_udp.cc
+tests_testudp_DEPENDENCIES= $(TESTS_LDADDS)
 
 tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL)
 
-tests_startservers_SOURCES= tests/start.c
+tests_startservers_SOURCES= tests/start.cc
 tests_startservers_DEPENDENCIES= $(TESTS_LDADDS)
 tests_startservers_LDADD= $(tests_startservers_DEPENDENCIES) $(LIBSASL)
 
-tests_testhashkit_SOURCES = tests/hashkit_functions.c
+tests_testhashkit_SOURCES = tests/hashkit_functions.cc
 tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la
 tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES)