X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=93f26bed0dc697c9604398bf2b83db3c973fbde6;hb=c5c5f2799a24eac8df5e11f447b48e031299579a;hp=6c263765bdb507bc329a6ed62261264fe895685b;hpb=4429c4e4315bfeb2bdfc59c3b39f8964f68524ef;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index 6c263765..93f26bed 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -96,6 +96,8 @@ check_PROGRAMS+= tests/testplus
 
 tests_atomsmasher_SOURCES= \
 			   tests/atomsmasher.cc \
+			   tests/debug.cc \
+			   tests/print.cc \
 			   clients/generator.cc \
 			   clients/execute.cc
 tests_atomsmasher_DEPENDENCIES= $(TESTS_LDADDS)
@@ -236,127 +238,101 @@ valgrind-memerror: clients/memerror
 	@echo "Testing memerror"
 	@$(VALGRIND_COMMAND) clients/memerror 0 > /dev/null
 
-
-
-
-
-MEMSLAP_COMMAND= clients/memslap
-
-MEM_COMMAND= tests/testapp
-
-TESTPLUS_COMMAND= tests/testplus
-
-HASHPLUS_COMMAND= tests/hashplus
-
-CYCLE_COMMAND= tests/cycle
-
-ATOM_COMMAND= tests/atomsmasher
-
-UDP_COMMAND= tests/testudp
-
-HASH_COMMAND= tests/testhashkit
-
 test-mem: tests/var tests/testapp
-	$(MEM_COMMAND)
+	@tests/testapp
 
 test-udp: tests/var tests/testudp
-	$(UDP_COMMAND)
+	@tests/testudp
 
 test-atom: tests/var tests/atomsmasher
-	$(ATOM_COMMAND)
+	@tests/atomsmasher
 
 test-plus: tests/var tests/testplus
-	$(TESTPLUS_COMMAND)
+	@tests/testplus
 
 test-hash: tests/var tests/testhashkit
-	$(HASH_COMMAND)
+	@tests/testhashkit
 
-test-hashplus: tests/var tests/hashplus
-	$(HASHPLUS_COMMAND)
+test-hashplus: tests/var tests/hash_plus
+	@tests/hash_plus
 
 test-cycle: tests/var tests/cycle
-	$(CYCLE_COMMAND)
+	@tests/cycle
 
 pahole-mem: tests/testapp
-	$(PAHOLE_COMMAND)  $(MEM_COMMAND)
+	@$(PAHOLE_COMMAND)  tests/testapp
 
 gdb-mem: tests/testapp
-	$(DEBUG_COMMAND)  $(MEM_COMMAND)
+	@$(DEBUG_COMMAND)  tests/testapp
 
 gdb-atom: tests/atomsmasher
-	$(DEBUG_COMMAND)  $(UDP_COMMAND)
+	@$(DEBUG_COMMAND) tests/testudp
 
 gdb-udp: tests/testudp
-	$(DEBUG_COMMAND)  $(ATOM_COMMAND)
+	@$(DEBUG_COMMAND) tests/atomsmasher
 
 gdb-plus: tests/testplus
-	$(DEBUG_COMMAND)  $(TESTPLUS_COMMAND)
+	$(DEBUG_COMMAND) tests/testplus
 
 gdb-hash: tests/testhashkit
-	$(DEBUG_COMMAND) $(HASH_COMMAND)
+	@$(DEBUG_COMMAND) tests/testhashkit
 
-gdb-hashplus: tests/hashplus
-	$(DEBUG_COMMAND) $(HASHPLUS_COMMAND)
+gdb-hashplus: tests/hash_plus
+	@$(DEBUG_COMMAND) tests/hash_plus
 
 gdb-cycle: tests/cycle
-	$(DEBUG_COMMAND) $(CYCLE_COMMAND)
+	@$(DEBUG_COMMAND) tests/cycle
 
 gdb-memslap: clients/memslap
-	$(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
+	@$(DEBUG_COMMAND) clients/memslap
 
 valgrind-cycle: tests/cycle
-	$(VALGRIND_COMMAND)  $(CYCLE_COMMAND)
+	$(VALGRIND_COMMAND) tests/cycle
 
 valgrind-mem: tests/testapp
-	$(VALGRIND_COMMAND)  $(MEM_COMMAND)
+	@$(VALGRIND_COMMAND) tests/testapp
 
 valgrind-atom: tests/atomsmasher
-	$(VALGRIND_COMMAND)  $(ATOM_COMMAND)
+	$(VALGRIND_COMMAND) tests/atomsmasher
 
 valgrind-udp: tests/testudp
-	$(VALGRIND_COMMAND)  $(UDP_COMMAND)
+	$(VALGRIND_COMMAND) tests/testudp
 
 valgrind-plus: tests/testplus
-	$(VALGRIND_COMMAND)  $(TESTPLUS_COMMAND)
+	@$(VALGRIND_COMMAND) tests/testplus
 
 valgrind-hash: tests/testhashkit
-	$(VALGRIND_COMMAND) $(HASH_COMMAND)
+	@$(VALGRIND_COMMAND) tests/testhashkit
 
-valgrind-hashplus: tests/hashplus
-	$(VALGRIND_COMMAND) $(HASHPLUS_COMMAND)
-
-valgrind-memslap: clients/memslap
-	$(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)
+valgrind-hashplus: tests/hash_plus
+	@$(VALGRIND_COMMAND) tests/hash_plus
 
 PHONY += valgrind
-valgrind: valgrind-mem valgrind-hash valgrind-memcat valgrind-memcp valgrind-memrm valgrind-memerror valgrind-memdump valgrind-memflush valgrind-memstat
+valgrind: valgrind-cycle valgrind-mem valgrind-udp valgrind-plus valgrind-hash valgrind-hashplus
 
 helgrind-cycle: tests/cycle
-	$(HELGRIND_COMMAND)  $(CYCLE_COMMAND)
+	@$(HELGRIND_COMMAND) tests/cycle
 
 helgrind-mem: tests/testapp
-	$(HELGRIND_COMMAND)  $(MEM_COMMAND)
+	@$(HELGRIND_COMMAND) tests/testapp
 
 helgrind-atom: tests/atomsmasher
-	$(HELGRIND_COMMAND)  $(ATOM_COMMAND)
+	@$(HELGRIND_COMMAND) tests/atomsmasher
 
 helgrind-udp: tests/testudp
-	$(HELGRIND_COMMAND)  $(UDP_COMMAND)
+	@$(HELGRIND_COMMAND) tests/testudp
 
 helgrind-plus: tests/testplus
-	$(HELGRIND_COMMAND)  $(TESTPLUS_COMMAND)
+	@$(HELGRIND_COMMAND) tests/testplus
 
 helgrind-hash: tests/testhashkit
-	$(HELGRIND_COMMAND) $(HASH_COMMAND)
-
-helgrind-hashplus: tests/hashplus
-	$(HELGRIND_COMMAND) $(HASHPLUS_COMMAND)
+	@$(HELGRIND_COMMAND) tests/testhashkit
 
-helgrind-memslap: clients/memslap
-	$(HELGRIND_COMMAND) $(MEMSLAP_COMMAND)
+helgrind-hashplus: tests/hash_plus
+	@$(HELGRIND_COMMAND) tests/hash_plus
 
-PHONY += helgrind
-helgrind: helgrind-mem helgrind-hash helgrind-memcat helgrind-memcp helgrind-memrm helgrind-memerror helgrind-memdump helgrind-memflush helgrind-memstat
+.PHONY += helgrind
+helgrind: helgrind-cycle helgrind-mem helgrind-udp helgrind-plus helgrind-hash helgrind-hashplus
 
 PHONY += cachegrind
 CLEANFILES += tests/cachegrind.out
@@ -372,17 +348,7 @@ callgrind:
 	$(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