X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2FMakefile.am;h=c840f68cc9d3124282bbf441af6719c541d624cf;hb=1b18496b3d1399d90cfba1975f23aee9c747445a;hp=27ccdab333a40869940f89bb56adc08138a4803f;hpb=96cdb1bc8279c9c0cef602b8b536228ead9f1154;p=m6w6%2Flibmemcached

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 27ccdab3..c840f68c 100644
--- 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,13 +18,34 @@ EXTRA_DIST = output.res output2.res\
 
 LIBS = 
 
-noinst_PROGRAMS = testapp
+noinst_HEADERS = test.h server.h ketama_test_cases.h
+noinst_PROGRAMS = testapp testplus udptest atomsmasher startservers
+noinst_LTLIBRARIES= libserver.la libtest.la
+
+libserver_la_SOURCES= server.c
+libtest_la_SOURCES= test.c
+
+testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+testapp_SOURCES = function.c
+testapp_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la libserver.la $(LDADDS)
+
+testplus_SOURCES = plus.cpp
+testplus_LDADD = libtest.la libserver.la $(LDADDS)
 
-testapp_SOURCES = test.c
-testapp_LDADD = $(LDADDS)
+udptest_SOURCES = udp.c
+udptest_LDADD = libtest.la libserver.la $(LDADDS)
+
+atomsmasher_SOURCES = atomsmasher.c
+atomsmasher_LDADD = $(top_builddir)/clients/libgenexec.la libtest.la libserver.la $(LDADDS)
+
+startservers_SOURCES = start.c
+startservers_LDADD = libserver.la $(LDADDS)
 
 record:
 	./testapp > output.res
+	./testplus > output_plus.res
+
+client-record:
 	sh t/memcat.test > r/memcat.res
 	sh t/memcp.test > r/memcp.res
 	sh t/memrm.test > r/memrm.res
@@ -31,9 +55,18 @@ record:
 record-extended:
 	./testapp extended > output2.res
 
-test: testapp
+test: testapp testplus library_test
+	echo "Tests completed"
+
+library_test:
 	./testapp > output.cmp
 	diff output.res output.cmp
+#	./testplus > output_plus.cmp
+#	diff output_plus.res output_plus.cmp
+
+clients:
+	memcached -d -P /tmp/Xumemc.pid -p 12555
+	export MEMCACHED_SERVERS="localhost:12555"
 	sh t/memcat.test > r/memcat.cmp
 	diff r/memcat.res r/memcat.cmp
 	sh t/memcp.test > r/memcp.cmp
@@ -44,13 +77,29 @@ test: testapp
 	diff r/memslap.res r/memslap.cmp
 	sh t/memstat.test > r/memstat.cmp
 	diff r/memstat.res r/memstat.cmp
-
-test-extended: testapp
-	./testapp extended > output.cmp
-	diff output2.res output.cmp
+	cat /tmp/Xumemc.pid | xargs kill
+	rm /tmp/Xumemc.pid
 
 valgrind:
 	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  testapp
 
-valgrind-extended:
-	libtool --mode=execute valgrind --leak-check=yes --show-reachable=yes  testapp extended
+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  ${top_builddir}/clients/memslap --server=localhost --concurrency=30
+
+test-no-outputdiff: testapp
+	./testapp > /dev/null
+	@echo "Test completed"