X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2FMakefile.am;h=70437c2ed3e26763110ef36381cead2ef45e3fd2;hb=013f64c9388d27db086b8643e267ad224a2ccc84;hp=7a642be76478cb992bd946cda181867844cfe29c;hpb=2b312deb8b7b3f662b492f94a13e673723387724;p=awesomized%2Flibmemcached

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7a642be7..70437c2e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,9 @@
-INCLUDES = -I$(top_builddir)
 LDADDS = $(top_builddir)/libmemcached/libmemcached.la
 
+if BUILD_LIBMEMCACHEDUTIL
+LDADDS+= $(top_builddir)/libmemcachedutil/libmemcachedutil.la
+endif
+
 EXTRA_DIST = output.res output2.res\
 		r/memcat.res\
 		r/memcp.res\
@@ -18,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)
 
@@ -71,3 +75,24 @@ clients:
 
 valgrind:
 	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  testapp
+
+cachegrind:
+	rm -f cachegrind.out.*
+	libtool --mode=execute valgrind --tool=cachegrind  --branch-sim=yes testapp
+	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
+	@echo "Test completed"