X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=2577e2f46f92f65ee24cdccc9a3d6998f0db80cd;hb=77e79fb2056c9a177a670da48178fd1ac051d33d;hp=1c54c1f568e0661f11dea73ade637b2f5138d87d;hpb=fd3e3ff98f94ba0f60abfd49ca393d1d5fb4d102;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index 1c54c1f5..2bbe5802 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -1,199 +1,433 @@
 # 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
 
-TESTS_LDADDS = libmemcached/libmemcached.la
-
-VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
+TESTS_LDADDS= \
+	      libmemcached/libmemcached.la \
+	      libmemcached/libmemcachedutil.la \
+	      libtest/libtest.la
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
-if BUILD_LIBMEMCACHEDUTIL
-TESTS_LDADDS+= libmemcached/libmemcachedutil.la
-endif
+PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
 
 EXTRA_DIST+= \
-	     tests/r/memcat.res \
-	     tests/r/memcp.res \
-	     tests/r/memrm.res \
-	     tests/r/memslap.res \
-	     tests/r/memstat.res \
-	     tests/t/memcat.test \
-	     tests/t/memcp.test \
-	     tests/t/memrm.test \
-	     tests/t/memslap.test \
-	     tests/t/memstat.test
+	     tests/cpp_example.cc \
+	     tests/output_plus.res
 
 noinst_HEADERS+= \
+		 tests/basic.h \
+		 tests/debug.h \
+		 tests/error_conditions.h \
 		 tests/hash_results.h \
+		 tests/ketama.h \
 		 tests/ketama_test_cases.h \
 		 tests/ketama_test_cases_spy.h \
 		 tests/libmemcached_world.h \
-		 tests/server.h \
-		 tests/test.h
+		 tests/namespace.h \
+		 tests/parser.h \
+		 tests/deprecated.h \
+		 tests/pool.h \
+		 tests/print.h \
+		 tests/replication.h \
+		 tests/server_add.h \
+		 tests/string.h \
+		 tests/virtual_buckets.h
+
+# Cycle should always run first
+tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+tests_cycle_CXXFLAGS= $(AM_CXXFLAGS)
+tests_cycle_CXXFLAGS+= ${PTHREAD_CFLAGS}
+tests_cycle_SOURCES= tests/cycle.cc
+tests_cycle_DEPENDENCIES= $(TESTS_LDADDS)
+tests_cycle_LDADD= $(tests_cycle_DEPENDENCIES)
+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/ketama.cc \
+		       tests/mem_functions.cc \
+		       tests/namespace.cc \
+		       tests/parser.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
 
-noinst_PROGRAMS+= \
-		  tests/atomsmasher \
-		  tests/startservers \
-		  tests/testapp \
-		  tests/testhashkit \
-		  tests/testplus
+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
+
+tests_failure_SOURCES= tests/failure.cc
+tests_failure_CXXFLAGS = $(AM_CXXFLAGS)
+tests_failure_DEPENDENCIES= $(TESTS_LDADDS)
+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)
+check_PROGRAMS+= tests/testhashkit
+noinst_PROGRAMS+= tests/testhashkit
+
+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
+noinst_PROGRAMS+= tests/hash_plus
+
+tests_memcapable_SOURCES= tests/memcapable.cc
+tests_memcapable_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_memcapable_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
+tests_memcapable_LDADD=  $(tests_memcapable_DEPENDENCIES)
+check_PROGRAMS+= tests/memcapable
+noinst_PROGRAMS+= tests/memcapable
+
+tests_memstat_SOURCES= tests/memstat.cc
+tests_memstat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_memstat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
+tests_memstat_LDADD=  $(tests_memstat_DEPENDENCIES)
+check_PROGRAMS+= tests/memstat
+noinst_PROGRAMS+= tests/memstat
+
+tests_memcp_SOURCES= tests/memcp.cc
+tests_memcp_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_memcp_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
+tests_memcp_LDADD=  $(tests_memcp_DEPENDENCIES)
+check_PROGRAMS+= tests/memcp
+noinst_PROGRAMS+= tests/memcp
+
+tests_memflush_SOURCES= tests/memflush.cc
+tests_memflush_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_memflush_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
+tests_memflush_LDADD=  $(tests_memflush_DEPENDENCIES)
+check_PROGRAMS+= tests/memflush
+noinst_PROGRAMS+= tests/memflush
+
+tests_memrm_SOURCES= tests/memrm.cc
+tests_memrm_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_memrm_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
+tests_memrm_LDADD=  $(tests_memrm_DEPENDENCIES)
+check_PROGRAMS+= tests/memrm
+noinst_PROGRAMS+= tests/memrm
+
+tests_memcat_SOURCES= tests/memcat.cc
+tests_memcat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_memcat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
+tests_memcat_LDADD=  $(tests_memcat_DEPENDENCIES)
+check_PROGRAMS+= tests/memcat
+noinst_PROGRAMS+= tests/memcat
+
+tests_memerror_SOURCES= tests/memerror.cc
+tests_memerror_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_memerror_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
+tests_memerror_LDADD=  $(tests_memerror_DEPENDENCIES)
+check_PROGRAMS+= tests/memerror
+noinst_PROGRAMS+= tests/memerror
+
+tests_memslap_SOURCES= tests/memslap.cc
+tests_memslap_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_memslap_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
+tests_memslap_LDADD=  $(tests_memslap_DEPENDENCIES)
+check_PROGRAMS+= tests/memslap
+noinst_PROGRAMS+= tests/memslap
+
+tests_memdump_SOURCES= tests/memdump.cc
+tests_memdump_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_memdump_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
+tests_memdump_LDADD=  $(tests_memdump_DEPENDENCIES)
+check_PROGRAMS+= tests/memdump
+noinst_PROGRAMS+= tests/memdump
+ 
+# Test linking with C application
+tests_c_test_SOURCES= tests/c_test.c
+tests_c_test_LDADD= libmemcached/libmemcached.la
+tests_c_test_DEPENDENCIES= libmemcached/libmemcached.la
+check_PROGRAMS+=tests/c_test
+noinst_PROGRAMS+=tests/c_test
+
+# Test linking with C application/SASL include
+tests_c_sasl_test_SOURCES= tests/c_sasl_test.c
+tests_c_sasl_test_LDADD= libmemcached/libmemcached.la
+tests_c_sasl_test_DEPENDENCIES= libmemcached/libmemcached.la
+check_PROGRAMS+=tests/c_sasl_test
+noinst_PROGRAMS+=tests/c_sasl_test
+
+test: check
+
+check-local: $(TEST_DOCS)
+	@echo "Tests completed"
+
+test-x: test-plus test-memcp test-memdump test-memflush test-memstat
+	@echo "Tests completed"
+
+test-memcp: clients/memcp
+	@echo "Testing memcp"
+	@@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
 
-noinst_LTLIBRARIES+= tests/libserver.la
-tests_libserver_la_SOURCES= tests/server.c
+valgrind-memcp: clients/memcat clients/memcp
+	@echo "Testing memcp"
+	@@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(VALGRIND_COMMAND) clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
 
-noinst_LTLIBRARIES+= tests/libtest.la
-tests_libtest_la_SOURCES= tests/test.c
+test-memflush: clients/memflush
+	@echo "Testing memflush"
+	@$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memflush --servers="localhost:12555"
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
 
-tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_testapp_SOURCES= tests/mem_functions.c
-tests_testapp_LDADD= \
-	clients/libgenexec.la \
-	tests/libserver.la \
-	tests/libtest.la \
-	libmemcached/libmemcachedinternal.la \
-	$(TESTS_LDADDS)
-tests_testapp_DEPENDENCIES= $(tests_testapp_LDADD)
+valgrind-memflush: clients/memflush
+	@echo "Testing memflush"
+	@$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(VALGRIND_COMMAND) clients/memflush --servers="localhost:12555"
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
 
-tests_testplus_SOURCES= tests/plus.cpp
-tests_testplus_LDADD= tests/libtest.la tests/libserver.la $(TESTS_LDADDS)
-tests_testplus_DEPENDENCIES= $(tests_testplus_LDADD)
-
-tests_atomsmasher_SOURCES= tests/atomsmasher.c
-tests_atomsmasher_LDADD= \
-	clients/libgenexec.la \
-	tests/libserver.la \
-	tests/libtest.la \
-	$(TESTS_LDADDS)
-tests_atomsmasher_DEPENDENCIES= $(tests_atomsmasher_LDADD)
-
-tests_startservers_SOURCES= tests/start.c
-tests_startservers_LDADD= tests/libserver.la $(TESTS_LDADDS)
-tests_startservers_DEPENDENCIES= $(tests_startservers_LDADD)
-
-tests_testhashkit_SOURCES = tests/hashkit_functions.c
-tests_testhashkit_LDADD = tests/libtest.la libhashkit/libhashkit.la
-tests_testhashkit_DEPENDENCIES = $(tests_testhashkit_LDADD)
-
-client-record:
-	sh tests/t/memcat.test > tests/r/memcat.res
-	sh tests/t/memcp.test > tests/r/memcp.res
-	sh tests/t/memrm.test > tests/r/memrm.res
-	sh tests/t/memslap.test > tests/r/memslap.res
-	sh tests/t/memstat.test > tests/r/memstat.res
-
-test: test-docs tests/testplus library_test memcapable libmhashkit_test
-	echo "Tests completed"
-
-library_test: tests/testapp
-	tests/testapp
-
-libmhashkit_test: libhashkit
-	tests/testhashkit
-
-memcapable: clients/memcapable
-	@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
-	@clients/memcapable -p 12555 || echo "Your memcached server does not support all commands"
+test-memdump: clients/memdump clients/memcp
+	@echo "Testing memdump"
+	@$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memcp --servers="localhost:12555" clients/memcat
+	@clients/memdump --servers="localhost:12555" > /dev/null
 	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
 	@rm tests/Xumemc.pid
 
-PHONY += clients
-clients:
-	@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
-	export MEMCACHED_SERVERS="localhost:12555"
-	sh tests/t/memcat.test > tests/r/memcat.cmp
-	diff tests/r/memcat.res tests/r/memcat.cmp
-	sh tests/t/memcp.test > tests/r/memcp.cmp
-	diff tests/r/memcp.res tests/r/memcp.cmp
-	sh tests/t/memrm.test > tests/r/memrm.cmp
-	diff tests/r/memrm.res tests/r/memrm.cmp
-	sh tests/t/memslap.test > tests/r/memslap.cmp
-	diff tests/r/memslap.res tests/r/memslap.cmp
-	sh tests/t/memstat.test > tests/r/memstat.cmp
-	diff tests/r/memstat.res tests/r/memstat.cmp
-	cat tests/Xumemc.pid | xargs kill
-	rm tests/Xumemc.pid
+valgrind-memdump: clients/memcat clients/memcp
+	@echo "Testing memdump"
+	@$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memcp --servers="localhost:12555" clients/memcat
+	@$(VALGRIND_COMMAND) clients/memdump --servers="localhost:12555" > /dev/null
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
 
-MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE)
+test-memstat: clients/memstat
+	@echo "Testing memstat"
+	@$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memstat --servers="localhost:12555" > /dev/null
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
 
-MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
+valgrind-memstat: clients/memstat
+	@echo "Testing memstat"
+	@$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(VALGRIND_COMMAND) clients/memstat --servers="localhost:12555" > /dev/null
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
 
-PLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
+test-mem: tests/var tests/testapp
+	@tests/testapp
 
-ATOM_COMMAND= tests/atomsmasher $(COLLECTION) $(SUITE)
+test-sasl: tests/sasl
+	@tests/sasl
 
-HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
+test-atom: tests/var tests/atomsmasher
+	@tests/atomsmasher
 
-test-mem: tests/testapp
-	$(MEM_COMMAND)
+test-plus: tests/var tests/testplus
+	@tests/testplus
 
-test-atom: tests/atomsmasher
-	$(ATOM_COMMAND)
+test-hash: tests/var tests/testhashkit
+	@tests/testhashkit
 
-test-plus: tests/testplus
-	$(PLUS_COMMAND)
+test-hashplus: tests/var tests/hash_plus
+	@tests/hash_plus
 
-test-hash: tests/testhashkit
-	$(HASH_COMMAND)
+test-cycle: tests/var tests/cycle
+	@tests/cycle
+
+test-memcapable: tests/var tests/memcapable
+	@tests/memcapable
+
+pahole-mem: tests/testapp
+	@$(PAHOLE_COMMAND)  tests/testapp
 
 gdb-mem: tests/testapp
-	$(DEBUG_COMMAND)  $(MEM_COMMAND)
+	@$(DEBUG_COMMAND)  tests/testapp
+
+gdb-sasl: tests/sasl
+	@$(DEBUG_COMMAND)  tests/sasl
 
 gdb-atom: tests/atomsmasher
-	$(DEBUG_COMMAND)  $(ATOM_COMMAND)
+	@$(DEBUG_COMMAND) tests/testudp
+
+gdb-udp: tests/testudp
+	@$(DEBUG_COMMAND) tests/atomsmasher
 
 gdb-plus: tests/testplus
-	$(DEBUG_COMMAND)  $(PLUS_COMMAND)
+	$(DEBUG_COMMAND) tests/testplus
 
 gdb-hash: tests/testhashkit
-	$(DEBUG_COMMAND) $(HASH_COMMAND)
+	@$(DEBUG_COMMAND) tests/testhashkit
+
+gdb-hashplus: tests/hash_plus
+	@$(DEBUG_COMMAND) tests/hash_plus
 
-gdb-memslap: clients/memslap
-	$(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
+gdb-cycle: tests/cycle
+	@$(DEBUG_COMMAND) tests/cycle
+
+gdb-failure: tests/failure
+	@$(DEBUG_COMMAND) tests/failure
+
+valgrind-cycle: tests/cycle
+	$(VALGRIND_COMMAND) tests/cycle
 
 valgrind-mem: tests/testapp
-	$(VALGRIND_COMMAND)  $(MEM_COMMAND)
+	@$(VALGRIND_COMMAND) tests/testapp
+
+valgrind-failure: tests/failure
+	@$(VALGRIND_COMMAND) tests/failure
 
 valgrind-atom: tests/atomsmasher
-	$(VALGRIND_COMMAND)  $(ATOM_COMMAND)
+	$(VALGRIND_COMMAND) tests/atomsmasher
+
+valgrind-udp: tests/testudp
+	$(VALGRIND_COMMAND) tests/testudp
 
 valgrind-plus: tests/testplus
-	$(VALGRIND_COMMAND)  $(PLUS_COMMAND)
+	@$(VALGRIND_COMMAND) tests/testplus
+
+valgrind-sasl: tests/sasl
+	@$(VALGRIND_COMMAND) tests/sasl
 
 valgrind-hash: tests/testhashkit
-	$(VALGRIND_COMMAND) $(HASH_COMMAND)
+	@$(VALGRIND_COMMAND) tests/testhashkit
 
-valgrind-memslap: clients/memslap
-	$(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)
+valgrind-hashplus: tests/hash_plus
+	@$(VALGRIND_COMMAND) tests/hash_plus
 
-PHONY += valgrind
-valgrind: tests/testapp tests/testhashkit valgrind-mem valgrind-hash 
+helgrind-cycle: tests/cycle
+	@$(HELGRIND_COMMAND) tests/cycle
 
-PHONY += cachegrind
+helgrind-mem: tests/testapp
+	@$(HELGRIND_COMMAND) tests/testapp
+
+helgrind-atom: tests/atomsmasher
+	@$(HELGRIND_COMMAND) tests/atomsmasher
+
+helgrind-udp: tests/testudp
+	@$(HELGRIND_COMMAND) tests/testudp
+
+helgrind-plus: tests/testplus
+	@$(HELGRIND_COMMAND) tests/testplus
+
+helgrind-hash: tests/testhashkit
+	@$(HELGRIND_COMMAND) tests/testhashkit
+
+helgrind-hashplus: tests/hash_plus
+	@$(HELGRIND_COMMAND) tests/hash_plus
+
+.PHONY += helgrind
+helgrind: helgrind-cycle helgrind-mem helgrind-udp helgrind-plus helgrind-hash helgrind-hashplus
+
+.PHONY += cachegrind
 CLEANFILES += tests/cachegrind.out
 cachegrind:
 	rm -f tests/cachegrind.out.*
 	$(LIBTOOL) --mode=execute valgrind --tool=cachegrind --cachegrind-out-file=tests/cachegrind.out.%p --branch-sim=yes tests/testapp
 	cg_annotate tests/cachegrind.out.* --auto=yes > tests/cachegrind.out
 
-PHONY += callgrind
+.PHONY += callgrind
 CLEANFILES += tests/callgrind.out
 callgrind:
 	rm -f tests/callgrind.out.*
 	$(LIBTOOL) --mode=execute valgrind --tool=callgrind --callgrind-out-file=tests/callgrind.out.%p  tests/testapp
 	callgrind_annotate tests/callgrind.out.* --auto=yes > tests/callgrind.out
 
-PHONY += helgrind
-CLEANFILES+= helgrind.out.*
-helgrind:
-	rm -f helgrind.out.*
-	$(LIBTOOL) --mode=execute valgrind --tool=helgrind  tests/testapp
-
-PHONY += helgrind-slap
-helgrind-slap:
-	$(LIBTOOL) --mode=execute valgrind --tool=helgrind  clients/memslap --server=localhost --concurrency=30
-
-test-no-outputdiff: test
-
 hudson-valgrind: tests/testapp
-	$(VALGRIND_COMMAND) --log-file=tests/valgrind.out $(MEM_COMMAND)
+	$(VALGRIND_COMMAND) --log-file=tests/valgrind.out tests/testapp