X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=e1bf136884e84cb481d1666b1e4283c9567c0fd8;hb=d753fca27268b2d3ab6bce64411c65287acbe25d;hp=896ba139530e348d7aa9419b0091e6f96ade7bb1;hpb=ff2f828a531d23ee087940fed20e8798fdf2c204;p=awesomized%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index 896ba139..e1bf1368 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -4,37 +4,40 @@
 
 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
 
 noinst_LTLIBRARIES+= tests/libserver.la
 tests_libserver_la_SOURCES= tests/server.c
@@ -43,11 +46,12 @@ 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)
 
@@ -55,10 +59,6 @@ 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= \
 	clients/libgenexec.la \
@@ -75,55 +75,178 @@ 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
-	sh tests/t/memcp.test > tests/r/memcp.res
-	sh tests/t/memrm.test > tests/r/memrm.res
-	sh tests/t/memslap.test > tests/r/memslap.res
-	sh tests/t/memstat.test > tests/r/memstat.res
-
-test: test-docs tests/testapp tests/testplus library_test memcapable libmhashkit_test
+test: test-docs test-plus test-mem test-hash memcapable
 	echo "Tests completed"
 
-library_test:
-	tests/testapp
-
-libmhashkit_test: libhashkit
-	tests/testhashkit
+test-x: test-docs test-plus test-mem test-hash memcapable test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
+	echo "Tests completed"
 
 memcapable: clients/memcapable
-	@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
 	@clients/memcapable -p 12555 || echo "Your memcached server does not support all commands"
 	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
 	@rm tests/Xumemc.pid
 
-PHONY += clients
-clients:
-	@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
-	export MEMCACHED_SERVERS="localhost:12555"
-	sh tests/t/memcat.test > tests/r/memcat.cmp
-	diff tests/r/memcat.res tests/r/memcat.cmp
-	sh tests/t/memcp.test > tests/r/memcp.cmp
-	diff tests/r/memcp.res tests/r/memcp.cmp
-	sh tests/t/memrm.test > tests/r/memrm.cmp
-	diff tests/r/memrm.res tests/r/memrm.cmp
-	sh tests/t/memslap.test > tests/r/memslap.cmp
-	diff tests/r/memslap.res tests/r/memslap.cmp
-	sh tests/t/memstat.test > tests/r/memstat.cmp
-	diff tests/r/memstat.res tests/r/memstat.cmp
-	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
+test-memcat: clients/memcat clients/memcp
+	@echo "Testing memcat"
+	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memcp --servers="localhost:12555" clients/memcp
+	@clients/memcat --servers="localhost:12555" memcp > tests/scratch
+#	@diff clients/memcp tests/scratch
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+	@rm tests/scratch
+
+valgrind-memcat: clients/memcat clients/memcp
+	@echo "Testing memcat"
+	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memcp --servers="localhost:12555" clients/memcp
+	@$(VALGRIND_COMMAND) clients/memcat --servers="localhost:12555" memcp > tests/scratch
+#	@diff clients/memcp tests/scratch
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+	@rm tests/scratch
+
+test-memcp: clients/memcp
+	@echo "Testing memcp"
+	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+
+valgrind-memcp: clients/memcat clients/memcp
+	@echo "Testing memcp"
+	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(VALGRIND_COMMAND) clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+
+test-memrm: clients/memrm clients/memcp
+	@echo "Testing memrm"
+	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memcp --servers="localhost:12555" clients/memcat
+	@clients/memrm --servers="localhost:12555" memcat
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+
+valgrind-memrm: clients/memcat clients/memcp
+	@echo "Testing memrm"
+	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memcp --servers="localhost:12555" clients/memcat
+	@$(VALGRIND_COMMAND) clients/memrm --servers="localhost:12555" memcat
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+
+test-memflush: clients/memflush
+	@echo "Testing memflush"
+	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memflush --servers="localhost:12555"
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+
+valgrind-memflush: clients/memflush
+	@echo "Testing memflush"
+	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(VALGRIND_COMMAND) clients/memflush --servers="localhost:12555"
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+
+test-memdump: clients/memdump clients/memcp
+	@echo "Testing memdump"
+	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memcp --servers="localhost:12555" clients/memcat
+	@clients/memdump --servers="localhost:12555" > /dev/null
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+
+valgrind-memdump: clients/memcat clients/memcp
+	@echo "Testing memdump"
+	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memcp --servers="localhost:12555" clients/memcat
+	@$(VALGRIND_COMMAND) clients/memdump --servers="localhost:12555" > /dev/null
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+
+test-memstat: clients/memstat
+	@echo "Testing memstat"
+	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memstat --servers="localhost:12555" > /dev/null
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+
+valgrind-memstat: clients/memstat
+	@echo "Testing memstat"
+	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(VALGRIND_COMMAND) clients/memstat --servers="localhost:12555" > /dev/null
+	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm tests/Xumemc.pid
+
+test-memerror: clients/memerror
+	@echo "Testing memerror"
+	@clients/memerror 0 > /dev/null
+
+valgrind-memerror: clients/memerror
+	@echo "Testing memerror"
+	@$(VALGRIND_COMMAND) clients/memerror 0 > /dev/null
+
+
+
+
+
+MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE)
+
+MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
+
+PLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
+
+ATOM_COMMAND= tests/atomsmasher $(COLLECTION) $(SUITE)
+
+HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
+
+test-mem: tests/testapp
+	$(MEM_COMMAND)
+
+test-atom: tests/atomsmasher
+	$(ATOM_COMMAND)
+
+test-plus: tests/testplus
+	$(PLUS_COMMAND)
+
+test-hash: tests/testhashkit
+	$(HASH_COMMAND)
+
+gdb-mem: tests/testapp
+	$(DEBUG_COMMAND)  $(MEM_COMMAND)
+
+gdb-atom: tests/atomsmasher
+	$(DEBUG_COMMAND)  $(ATOM_COMMAND)
+
+gdb-plus: tests/testplus
+	$(DEBUG_COMMAND)  $(PLUS_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)
+
+valgrind-atom: tests/atomsmasher
+	$(VALGRIND_COMMAND)  $(ATOM_COMMAND)
+
+valgrind-plus: tests/testplus
+	$(VALGRIND_COMMAND)  $(PLUS_COMMAND)
+
+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 valgrind-memcat valgrind-memcp valgrind-memrm valgrind-memerror valgrind-memdump valgrind-memflush valgrind-memstat
 
 PHONY += cachegrind
 CLEANFILES += tests/cachegrind.out
@@ -151,5 +274,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)