X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=1bf7201106a290eaa93e275314a83b7307986f47;hb=f1563c45b37bba7d51228af44dc184a9d0308e81;hp=1f66d701689ec783a7918f85ccfe3281c901b00a;hpb=8e092d3548a2bc5011a12817edf76e1c1403fca3;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index 1f66d701..1bf72011 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -8,6 +8,8 @@ VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-rea
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
+PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
+
 if BUILD_LIBMEMCACHEDUTIL
 TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 endif
@@ -75,38 +77,123 @@ 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 test-plus test-mem test-hash memcapable
+	echo "Tests completed"
 
-test: test-docs test-mem test-plus test-hash memcapable
+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
+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)
 
@@ -130,6 +217,10 @@ test-plus: tests/testplus
 test-hash: tests/testhashkit
 	$(HASH_COMMAND)
 
+pahole-mem: tests/testapp
+	$(PAHOLE_COMMAND)  $(MEM_COMMAND)
+
+
 gdb-mem: tests/testapp
 	$(DEBUG_COMMAND)  $(MEM_COMMAND)
 
@@ -161,7 +252,7 @@ valgrind-memslap: clients/memslap
 	$(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)
 
 PHONY += valgrind
-valgrind: tests/testapp tests/testhashkit valgrind-mem valgrind-hash 
+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