X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2FMakefile.am;h=dd7ba749c9bb3b450ae0fe9d7a4612a5bce15ab5;hb=276c3db8d1dc8e14949df2b408960a803bea5d53;hp=f739b4b0b45177c1d02ef5a92d800960508fb9c9;hpb=8af90ac15d8ba8ec464e5ad402ed2d27b95f81e3;p=awesomized%2Flibmemcached

diff --git a/tests/Makefile.am b/tests/Makefile.am
index f739b4b0..dd7ba749 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\
@@ -15,7 +18,7 @@ EXTRA_DIST = output.res output2.res\
 
 LIBS = 
 
-noinst_HEADERS = test.h server.h
+noinst_HEADERS = test.h server.h ketama_test_cases.h
 noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
 
 testapp_SOURCES = test.c function.c server.c ../clients/generator.c ../clients/execute.c
@@ -71,3 +74,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"