X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Fcli.am;h=ecc66dda7be1e855294da3c32fe267e4ac29d689;hb=64e9fa38f42f0d30463da5ddc3a573619941d93a;hp=689c5c52f08f0d9d83237413491f02c489b2beeb;hpb=cee29363be93defd1786f5dd2354a38c5d14f2b0;p=m6w6%2Flibmemcached

diff --git a/tests/cli.am b/tests/cli.am
index 689c5c52..ecc66dda 100644
--- a/tests/cli.am
+++ b/tests/cli.am
@@ -86,67 +86,11 @@ tests_memdump_LDADD=  libtest/libtest.la $(TESTS_LDADDS)
 check_PROGRAMS+= tests/memdump
 noinst_PROGRAMS+= tests/memdump
 
-test-memerror: clients/memerror
+test-memstat: tests/memstat
+	tests/memstat
+
+test-memerror: tests/memerror
 	tests/memerror
 
 valgrind-memerror: clients/memerror
 	 @$(VALGRIND_COMMAND) tests/memerror
-
-test-memcp: clients/memcp
-	@echo "Testing memcp"
-	@@MEMC_BINARY@ -d -u root -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 -u root -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-memflush: clients/memflush
-	@echo "Testing memflush"
-	@$(MEMC_BINARY) -d -u root -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"
-	@$(MEMC_BINARY) -d -u root -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"
-	@$(MEMC_BINARY) -d -u root -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"
-	@$(MEMC_BINARY) -d -u root -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"
-	@$(MEMC_BINARY) -d -u root -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"
-	@$(MEMC_BINARY) -d -u root -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
-