Flip call (NULL is more common). Also add in helgrind and fix calloc.

[awesomized/libmemcached] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index dc8ee2d242d3f1739ea5a5280c6cb378c74f7ab0..dd7ba749c9bb3b450ae0fe9d7a4612a5bce15ab5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,8 @@
-INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/lib
-LDADDS = ../lib/libmemcached.la
+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\
@@ -15,12 +18,24 @@ EXTRA_DIST = output.res output2.res\
 
 LIBS = 
 
-noinst_HEADERS = test.h
-noinst_PROGRAMS = testapp
+noinst_HEADERS = test.h server.h ketama_test_cases.h
+noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
 
-testapp_SOURCES = test.c function.c ../src/generator.c ../src/execute.c
+testapp_SOURCES = test.c function.c server.c ../clients/generator.c ../clients/execute.c
 testapp_LDADD = $(LDADDS)
 
+testplus_SOURCES = test.c plus.cpp server.c
+testplus_LDADD = $(LDADDS)
+
+udptest_SOURCES = test.c udp.c server.c
+udptest_LDADD = $(LDADDS)
+
+atomsmasher_SOURCES = test.c atomsmasher.c server.c ../clients/generator.c ../clients/execute.c
+atomsmasher_LDADD = $(LDADDS)
+
+startservers_SOURCES = start.c server.c
+startservers_LDADD = $(LDADDS)
+
 record:
        ./testapp > output.res
 
@@ -59,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"