X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2FMakefile.am;h=70437c2ed3e26763110ef36381cead2ef45e3fd2;hb=90a442f849042215ff99e0d26625dd832a11d293;hp=5e51f666e0cfe0edb9af4d3a62db15196f8cd242;hpb=1d3aea18eadb5a2ca6893ab860bb5dbace09b94a;p=m6w6%2Flibmemcached

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5e51f666..70437c2e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -21,6 +21,7 @@ LIBS =
 noinst_HEADERS = test.h server.h ketama_test_cases.h
 noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
 
+testapp_CFLAGS= ${AM_CFLAGS} ${NO_CONVERSION}
 testapp_SOURCES = test.c function.c server.c ../clients/generator.c ../clients/execute.c
 testapp_LDADD = $(LDADDS)
 
@@ -76,9 +77,21 @@ valgrind:
 	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  testapp
 
 cachegrind:
-	rm cachegrind.out.*
+	rm -f cachegrind.out.*
 	libtool --mode=execute valgrind --tool=cachegrind  --branch-sim=yes testapp
-	cg_annotate cachegrind.out.* --auto=yes > /tmp/calgrind.out
+	cg_annotate cachegrind.out.* --auto=yes > /tmp/cachegrind.out
+
+callgrind:
+	rm -f callgrind.out.*
+	libtool --mode=execute valgrind --tool=callgrind  testapp
+	callgrind_annotate callgrind.out.* --auto=yes > /tmp/callgrind.out
+
+helgrind:
+	rm -f helgrind.out.*
+	libtool --mode=execute valgrind --tool=helgrind  testapp
+
+helgrind-slap:
+	libtool --mode=execute valgrind --tool=helgrind  ../clients/memslap --server=localhost --concurrency=30
 
 test-no-outputdiff: testapp
 	./testapp > /dev/null