X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=b13674ec346ea83739585c30230d7f517943572d;hb=04bbb4383e54d431a3513045dad4be62b91c64af;hp=32f044c9c828e6f53131156b2577a68a5228f9ff;hpb=3107b89b4d3441929835e6f96fda841c76f704fe;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index 32f044c9..b13674ec 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -32,6 +32,7 @@ noinst_PROGRAMS+= \
 	tests/atomsmasher \
 	tests/startservers \
 	tests/testapp \
+	tests/testhashkit \
 	tests/testplus \
 	tests/udptest
 
@@ -47,13 +48,17 @@ 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= \
@@ -61,9 +66,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_LDADD = tests/libtest.la libhashkit/libhashkit.la
+tests_testhashkit_DEPENDENCIES = $(tests_testhashkit_LDADD)
 
 client-record:
 	sh tests/t/memcat.test > tests/r/memcat.res
@@ -72,12 +83,14 @@ 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
+test: test-docs tests/testapp tests/testplus library_test memcapable libmhashkit_test
 	echo "Tests completed"
 
 library_test:
 	tests/testapp
-#	tests/testplus
+
+libmhashkit_test: libhashkit
+	tests/testhashkit
 
 memcapable: clients/memcapable
 	@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
@@ -102,6 +115,13 @@ clients:
 	cat tests/Xumemc.pid | xargs kill
 	rm tests/Xumemc.pid
 
+gdb-mem:
+	$(LIBTOOL) --mode=execute gdb tests/testapp
+
+gdb-hash:
+	$(LIBTOOL) --mode=execute gdb tests/testhashkit
+
+
 PHONY += valgrind
 valgrind:
 	$(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes  tests/testapp