X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=93f26bed0dc697c9604398bf2b83db3c973fbde6;hb=c5c5f2799a24eac8df5e11f447b48e031299579a;hp=f1d00ef0f2636204fda7df1701505338734a9fcb;hpb=dac48f2dbe34915755f8f4f7f88419f47dc9e27f;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index f1d00ef0..93f26bed 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -1,10 +1,16 @@
 # vim:ft=automake
+# Copyright (C) 2011 Data Differential
+# All rights reserved.
+#
+# Use and distribution licensed under the BSD license.  See
+# the COPYING file in the parent directory for full text.
+#
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-TESTS_LDADDS = libmemcached/libmemcached.la
-
-VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
+TESTS_LDADDS= \
+	      libmemcached/libmemcached.la \
+	      libtest/libtest.la
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
@@ -15,98 +21,134 @@ 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/cpp_example.cc \
+	     tests/output_plus.res
 
 noinst_HEADERS+= \
+		 tests/basic.h \
+		 tests/debug.h \
+		 tests/error_conditions.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
+		 tests/namespace.h \
+		 tests/parser.h \
+		 tests/deprecated.h \
+		 tests/pool.h \
+		 tests/print.h \
+		 tests/replication.h \
+		 tests/string.h \
+		 tests/virtual_buckets.h
+
 
 noinst_PROGRAMS+= \
 		  tests/atomsmasher \
-		  tests/hashplus \
-		  tests/startservers \
+		  tests/cycle \
+		  tests/hash_plus \
 		  tests/testapp \
 		  tests/testhashkit \
-		  tests/testplus
+		  tests/testplus \
+		  tests/testudp
 
-noinst_LTLIBRARIES+= tests/libserver.la
-tests_libserver_la_SOURCES= tests/server.c
+# Cycle should always run first
+tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+tests_cycle_SOURCES= tests/cycle.cc
+tests_cycle_DEPENDENCIES= $(TESTS_LDADDS)
+tests_cycle_LDADD= $(tests_cycle_DEPENDENCIES)
+check_PROGRAMS+= tests/cycle
 
-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/mem_functions.c
+tests_testapp_SOURCES= \
+		       tests/basic.cc \
+		       tests/debug.cc \
+		       tests/deprecated.cc \
+		       tests/error_conditions.cc \
+		       tests/mem_functions.cc \
+		       tests/namespace.cc \
+		       tests/parser.cc \
+		       tests/pool.cc \
+		       tests/print.cc \
+		       tests/replication.cc \
+		       tests/string.cc \
+		       tests/virtual_buckets.cc
+tests_testapp_SOURCES+= clients/generator.cc clients/execute.cc
+
+tests_testapp_DEPENDENCIES= \
+			    $(BUILT_SOURCES) \
+			    $(TESTS_LDADDS) \
+			    libhashkit/libhashkit.la \
+			    libmemcached/libmemcachedinternal.la
+
 tests_testapp_LDADD= \
-	clients/libgenexec.la \
-	tests/libserver.la \
-	tests/libtest.la \
-	libmemcached/libmemcachedinternal.la \
-	$(TESTS_LDADDS)
-tests_testapp_DEPENDENCIES= $(tests_testapp_LDADD)
+		     $(LIBSASL) \
+		     $(TESTS_LDADDS) \
+		     libhashkit/libhashkit.la \
+		     libmemcached/libmemcachedinternal.la
+check_PROGRAMS+= tests/testapp
 
 tests_testplus_SOURCES= tests/plus.cpp
-tests_testplus_LDADD= tests/libtest.la tests/libserver.la $(TESTS_LDADDS)
-tests_testplus_DEPENDENCIES= $(tests_testplus_LDADD)
-
-tests_atomsmasher_SOURCES= tests/atomsmasher.c
-tests_atomsmasher_LDADD= \
-	clients/libgenexec.la \
-	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)
-
-tests_hashplus_SOURCES = tests/hash_plus.cc
-tests_hashplus_LDADD = $(tests_testhashkit_LDADD)
-tests_hashplus_DEPENDENCIES = $(tests_testhashkit_LDADD)
-
-test: test-docs test-mem test-hash memcapable
-	echo "Tests completed"
-
-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"
+tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_testplus_DEPENDENCIES= $(TESTS_LDADDS)
+tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) $(LIBSASL)
+check_PROGRAMS+= tests/testplus
+
+tests_atomsmasher_SOURCES= \
+			   tests/atomsmasher.cc \
+			   tests/debug.cc \
+			   tests/print.cc \
+			   clients/generator.cc \
+			   clients/execute.cc
+tests_atomsmasher_DEPENDENCIES= $(TESTS_LDADDS)
+tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) $(LIBSASL)
+
+tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+tests_testudp_SOURCES= tests/mem_udp.cc
+tests_testudp_DEPENDENCIES= $(TESTS_LDADDS)
+tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL)
+check_PROGRAMS+= tests/testudp
+
+tests_testhashkit_SOURCES = tests/hashkit_functions.cc
+tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
+tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES)
+check_PROGRAMS+= tests/testhashkit
+
+tests_hash_plus_SOURCES= tests/hash_plus.cc
+tests_hash_plus_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_hash_plus_DEPENDENCIES= $(tests_testhashkit_DEPENDENCIES) $(TESTS_LDADDS)
+tests_hash_plus_LDADD= $(tests_testhashkit_DEPENDENCIES)
+check_PROGRAMS+= tests/hash_plus
+
+test: check
+
+check-local: tests/var $(TEST_DOCS) memcapable
+	@echo "Tests completed"
+
+test-x: tests/var test-plus 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 -u root -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
 
 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
+	@@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
+	@clients/memcp --servers="localhost:12555" `pwd`/clients/memcp
+	@clients/memcat --servers="localhost:12555" memcp > `pwd`/tests/scratch
+	@clients/memcat --servers="localhost:12555" --file=`pwd`/tests/scratch2 memcp
 #	@diff clients/memcp tests/scratch
-	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
-	@rm tests/Xumemc.pid
-	@rm tests/scratch
+	@cat `pwd`/tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
+	@rm `pwd`/tests/Xumemc.pid
+	@rm `pwd`/tests/scratch
+	@rm `pwd`/tests/scratch2
 
 valgrind-memcat: clients/memcat clients/memcp
 	@echo "Testing memcat"
-	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@@MEMC_BINARY@ -d -u root -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
@@ -116,21 +158,21 @@ valgrind-memcat: clients/memcat clients/memcp
 
 test-memcp: clients/memcp
 	@echo "Testing memcp"
-	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@@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 -P `pwd`/tests/Xumemc.pid -p 12555
+	@@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-memrm: clients/memrm clients/memcp
 	@echo "Testing memrm"
-	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@@MEMC_BINARY@ -d -u root -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"
@@ -138,7 +180,7 @@ test-memrm: clients/memrm clients/memcp
 
 valgrind-memrm: clients/memcat clients/memcp
 	@echo "Testing memrm"
-	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@@MEMC_BINARY@ -d -u root -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"
@@ -146,21 +188,21 @@ valgrind-memrm: clients/memcat clients/memcp
 
 test-memflush: clients/memflush
 	@echo "Testing memflush"
-	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(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"
-	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(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"
-	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(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"
@@ -168,7 +210,7 @@ test-memdump: clients/memdump clients/memcp
 
 valgrind-memdump: clients/memcat clients/memcp
 	@echo "Testing memdump"
-	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(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"
@@ -176,14 +218,14 @@ valgrind-memdump: clients/memcat clients/memcp
 
 test-memstat: clients/memstat
 	@echo "Testing memstat"
-	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(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"
-	@/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555
+	@$(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
@@ -196,78 +238,101 @@ valgrind-memerror: clients/memerror
 	@echo "Testing memerror"
 	@$(VALGRIND_COMMAND) clients/memerror 0 > /dev/null
 
+test-mem: tests/var tests/testapp
+	@tests/testapp
 
+test-udp: tests/var tests/testudp
+	@tests/testudp
 
+test-atom: tests/var tests/atomsmasher
+	@tests/atomsmasher
 
+test-plus: tests/var tests/testplus
+	@tests/testplus
 
-MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE)
-
-MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
-
-MEMPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
-
-HASHPLUS_COMMAND= tests/hashplus $(COLLECTION) $(SUITE)
-
-ATOM_COMMAND= tests/atomsmasher $(COLLECTION) $(SUITE)
-
-HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
+test-hash: tests/var tests/testhashkit
+	@tests/testhashkit
 
-test-mem: tests/testapp
-	$(MEM_COMMAND)
+test-hashplus: tests/var tests/hash_plus
+	@tests/hash_plus
 
-test-atom: tests/atomsmasher
-	$(ATOM_COMMAND)
-
-test-plus: tests/testplus
-	$(MEMPLUS_COMMAND)
-
-test-hash: tests/testhashkit
-	$(HASH_COMMAND)
-
-test-hashplus: tests/hashplus
-	$(HASHPLUS_COMMAND)
+test-cycle: tests/var tests/cycle
+	@tests/cycle
 
 pahole-mem: tests/testapp
-	$(PAHOLE_COMMAND)  $(MEM_COMMAND)
+	@$(PAHOLE_COMMAND)  tests/testapp
 
 gdb-mem: tests/testapp
-	$(DEBUG_COMMAND)  $(MEM_COMMAND)
+	@$(DEBUG_COMMAND)  tests/testapp
 
 gdb-atom: tests/atomsmasher
-	$(DEBUG_COMMAND)  $(ATOM_COMMAND)
+	@$(DEBUG_COMMAND) tests/testudp
+
+gdb-udp: tests/testudp
+	@$(DEBUG_COMMAND) tests/atomsmasher
 
 gdb-plus: tests/testplus
-	$(DEBUG_COMMAND)  $(MEMPLUS_COMMAND)
+	$(DEBUG_COMMAND) tests/testplus
 
 gdb-hash: tests/testhashkit
-	$(DEBUG_COMMAND) $(HASH_COMMAND)
+	@$(DEBUG_COMMAND) tests/testhashkit
+
+gdb-hashplus: tests/hash_plus
+	@$(DEBUG_COMMAND) tests/hash_plus
 
-gdb-hashplus: tests/hashplus
-	$(DEBUG_COMMAND) $(HASHPLUS_COMMAND)
+gdb-cycle: tests/cycle
+	@$(DEBUG_COMMAND) tests/cycle
 
 gdb-memslap: clients/memslap
-	$(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
+	@$(DEBUG_COMMAND) clients/memslap
+
+valgrind-cycle: tests/cycle
+	$(VALGRIND_COMMAND) tests/cycle
 
 valgrind-mem: tests/testapp
-	$(VALGRIND_COMMAND)  $(MEM_COMMAND)
+	@$(VALGRIND_COMMAND) tests/testapp
 
 valgrind-atom: tests/atomsmasher
-	$(VALGRIND_COMMAND)  $(ATOM_COMMAND)
+	$(VALGRIND_COMMAND) tests/atomsmasher
+
+valgrind-udp: tests/testudp
+	$(VALGRIND_COMMAND) tests/testudp
 
 valgrind-plus: tests/testplus
-	$(VALGRIND_COMMAND)  $(MEMPLUS_COMMAND)
+	@$(VALGRIND_COMMAND) tests/testplus
 
 valgrind-hash: tests/testhashkit
-	$(VALGRIND_COMMAND) $(HASH_COMMAND)
+	@$(VALGRIND_COMMAND) tests/testhashkit
 
-valgrind-hashplus: tests/hashplus
-	$(VALGRIND_COMMAND) $(HASHPLUS_COMMAND)
-
-valgrind-memslap: clients/memslap
-	$(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)
+valgrind-hashplus: tests/hash_plus
+	@$(VALGRIND_COMMAND) tests/hash_plus
 
 PHONY += valgrind
-valgrind: tests/testapp tests/testhashkit valgrind-mem valgrind-hash valgrind-memcat valgrind-memcp valgrind-memrm valgrind-memerror valgrind-memdump valgrind-memflush valgrind-memstat
+valgrind: valgrind-cycle valgrind-mem valgrind-udp valgrind-plus valgrind-hash valgrind-hashplus
+
+helgrind-cycle: tests/cycle
+	@$(HELGRIND_COMMAND) tests/cycle
+
+helgrind-mem: tests/testapp
+	@$(HELGRIND_COMMAND) tests/testapp
+
+helgrind-atom: tests/atomsmasher
+	@$(HELGRIND_COMMAND) tests/atomsmasher
+
+helgrind-udp: tests/testudp
+	@$(HELGRIND_COMMAND) tests/testudp
+
+helgrind-plus: tests/testplus
+	@$(HELGRIND_COMMAND) tests/testplus
+
+helgrind-hash: tests/testhashkit
+	@$(HELGRIND_COMMAND) tests/testhashkit
+
+helgrind-hashplus: tests/hash_plus
+	@$(HELGRIND_COMMAND) tests/hash_plus
+
+.PHONY += helgrind
+helgrind: helgrind-cycle helgrind-mem helgrind-udp helgrind-plus helgrind-hash helgrind-hashplus
 
 PHONY += cachegrind
 CLEANFILES += tests/cachegrind.out
@@ -283,17 +348,7 @@ callgrind:
 	$(LIBTOOL) --mode=execute valgrind --tool=callgrind --callgrind-out-file=tests/callgrind.out.%p  tests/testapp
 	callgrind_annotate tests/callgrind.out.* --auto=yes > tests/callgrind.out
 
-PHONY += helgrind
-CLEANFILES+= helgrind.out.*
-helgrind:
-	rm -f helgrind.out.*
-	$(LIBTOOL) --mode=execute valgrind --tool=helgrind  tests/testapp
-
-PHONY += helgrind-slap
-helgrind-slap:
-	$(LIBTOOL) --mode=execute valgrind --tool=helgrind  clients/memslap --server=localhost --concurrency=30
-
 test-no-outputdiff: test
 
 hudson-valgrind: tests/testapp
-	$(VALGRIND_COMMAND) --log-file=tests/valgrind.out $(MEM_COMMAND)
+	$(VALGRIND_COMMAND) --log-file=tests/valgrind.out tests/testapp