X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=84951014d7a84bbe01619488ceece238c9f4074b;hb=20135dd714ee451efbcb0f741ed67d2f115985d2;hp=ddc2678bcb709e7998e84aebe59d159249809227;hpb=7c986323bd4eece0d805f4df17eb03ea094f84f6;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index ddc2678b..84951014 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -4,37 +4,41 @@
 
 TESTS_LDADDS = libmemcached/libmemcached.la
 
+VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
+
+DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
+
 if BUILD_LIBMEMCACHEDUTIL
 TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 endif
 
 EXTRA_DIST+= \
-	tests/r/memcat.res \
-	tests/r/memcp.res \
-	tests/r/memrm.res \
-	tests/r/memslap.res \
-	tests/r/memstat.res \
-	tests/t/memcat.test \
-	tests/t/memcp.test \
-	tests/t/memrm.test \
-	tests/t/memslap.test \
-	tests/t/memstat.test
+	     tests/r/memcat.res \
+	     tests/r/memcp.res \
+	     tests/r/memrm.res \
+	     tests/r/memslap.res \
+	     tests/r/memstat.res \
+	     tests/t/memcat.test \
+	     tests/t/memcp.test \
+	     tests/t/memrm.test \
+	     tests/t/memslap.test \
+	     tests/t/memstat.test
 
 noinst_HEADERS+= \
-	tests/hash_results.h \
-	tests/ketama_test_cases.h \
-	tests/ketama_test_cases_spy.h \
-	tests/libmemcached_world.h \
-	tests/server.h \
-	tests/test.h
+		 tests/hash_results.h \
+		 tests/ketama_test_cases.h \
+		 tests/ketama_test_cases_spy.h \
+		 tests/libmemcached_world.h \
+		 tests/server.h \
+		 tests/test.h
 
 noinst_PROGRAMS+= \
-	tests/atomsmasher \
-	tests/startservers \
-	tests/testapp \
-	tests/testhashkit \
-	tests/testplus \
-	tests/udptest
+		  tests/atomsmasher \
+		  tests/startservers \
+		  tests/testapp \
+		  tests/testhashkit \
+		  tests/testplus \
+		  tests/udptest
 
 noinst_LTLIBRARIES+= tests/libserver.la
 tests_libserver_la_SOURCES= tests/server.c
@@ -43,18 +47,22 @@ noinst_LTLIBRARIES+= tests/libtest.la
 tests_libtest_la_SOURCES= tests/test.c
 
 tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_testapp_SOURCES= tests/function.c
+tests_testapp_SOURCES= tests/mem_functions.c
 tests_testapp_LDADD= \
 	clients/libgenexec.la \
 	tests/libserver.la \
 	tests/libtest.la \
+	libmemcached/libmemcachedinternal.la \
 	$(TESTS_LDADDS)
+tests_testapp_DEPENDENCIES= $(tests_testapp_LDADD)
 
 tests_testplus_SOURCES= tests/plus.cpp
 tests_testplus_LDADD= tests/libtest.la tests/libserver.la $(TESTS_LDADDS)
+tests_testplus_DEPENDENCIES= $(tests_testplus_LDADD)
 
 tests_udptest_SOURCES= tests/udp.c
 tests_udptest_LDADD= tests/libtest.la tests/libserver.la $(TESTS_LDADDS)
+tests_udptest_DEPENDENCIES= $(tests_udptest_LDADD)
 
 tests_atomsmasher_SOURCES= tests/atomsmasher.c
 tests_atomsmasher_LDADD= \
@@ -62,13 +70,15 @@ tests_atomsmasher_LDADD= \
 	tests/libserver.la \
 	tests/libtest.la \
 	$(TESTS_LDADDS)
+tests_atomsmasher_DEPENDENCIES= $(tests_atomsmasher_LDADD)
 
 tests_startservers_SOURCES= tests/start.c
 tests_startservers_LDADD= tests/libserver.la $(TESTS_LDADDS)
+tests_startservers_DEPENDENCIES= $(tests_startservers_LDADD)
 
-tests_testhashkit_SOURCES = tests/hashkit_functions.c 
+tests_testhashkit_SOURCES = tests/hashkit_functions.c
 tests_testhashkit_LDADD = tests/libtest.la libhashkit/libhashkit.la
-tests_testhashkit_DEPENDENCIES = libhashkit
+tests_testhashkit_DEPENDENCIES = $(tests_testhashkit_LDADD)
 
 client-record:
 	sh tests/t/memcat.test > tests/r/memcat.res
@@ -77,12 +87,11 @@ client-record:
 	sh tests/t/memslap.test > tests/r/memslap.res
 	sh tests/t/memstat.test > tests/r/memstat.res
 
-test: tests/testapp tests/testplus library_test memcapable libmhashkit_test
+test: test-docs tests/testplus library_test memcapable libmhashkit_test
 	echo "Tests completed"
 
-library_test:
+library_test: tests/testapp
 	tests/testapp
-#	tests/testplus
 
 libmhashkit_test: libhashkit
 	tests/testhashkit
@@ -110,16 +119,38 @@ clients:
 	cat tests/Xumemc.pid | xargs kill
 	rm tests/Xumemc.pid
 
-gdb-mem:
-	$(LIBTOOL) --mode=execute gdb tests/testapp
+MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE)
+
+MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
+
+HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
+
+test-mem: tests/testapp
+	$(MEM_COMMAND)
+
+test-hash: tests/testhashkit
+	$(HASH_COMMAND)
+
+gdb-mem: tests/testapp
+	$(DEBUG_COMMAND)  $(MEM_COMMAND)
+
+gdb-hash: tests/testhashkit
+	$(DEBUG_COMMAND) $(HASH_COMMAND)
+
+gdb-memslap: clients/memslap
+	$(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
+
+valgrind-mem: tests/testapp
+	$(VALGRIND_COMMAND)  $(MEM_COMMAND)
 
-gdb-hash:
-	$(LIBTOOL) --mode=execute gdb tests/testhashkit
+valgrind-hash: tests/testhashkit
+	$(VALGRIND_COMMAND) $(HASH_COMMAND)
 
+valgrind-memslap: clients/memslap
+	$(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)
 
 PHONY += valgrind
-valgrind:
-	$(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes  tests/testapp
+valgrind: tests/testapp tests/testhashkit valgrind-mem valgrind-hash 
 
 PHONY += cachegrind
 CLEANFILES += tests/cachegrind.out
@@ -147,5 +178,5 @@ helgrind-slap:
 
 test-no-outputdiff: test
 
-hudson-valgrind:
-	$(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --log-file=tests/valgrind.out tests/testapp
+hudson-valgrind: tests/testapp
+	$(VALGRIND_COMMAND) --log-file=tests/valgrind.out $(MEM_COMMAND)