X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=b8e9e17f52f10e89cab1d8f927e2f5609342212a;hb=19d7df5119c3f07370f58857f4d916cd5de398ea;hp=8e173d88a331f2a63ade91bc8abf520f66bb15ee;hpb=15cb8f72fc3382dd80a88028cf45c05dcb2fa1ef;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index 8e173d88..b8e9e17f 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -8,38 +8,25 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-TESTS_LDADDS= \
-	      libmemcached/libmemcached.la \
-	      libmemcached/libmemcachedutil.la \
-	      libtest/libtest.la
+TESTS_LDADDS=
+TESTS_LDADDS+= libmemcached/libmemcached.la
+TESTS_LDADDS+= libmemcached/libmemcachedutil.la
+TESTS_LDADDS+= libtest/libtest.la
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
 PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
 
-EXTRA_DIST+= \
-	     tests/cpp_example.cc \
-	     tests/output_plus.res
-
-noinst_HEADERS+= \
-		 tests/basic.h \
-		 tests/debug.h \
-		 tests/error_conditions.h \
-		 tests/exist.h \
-		 tests/hash_results.h \
-		 tests/ketama.h \
-		 tests/ketama_test_cases.h \
-		 tests/ketama_test_cases_spy.h \
-		 tests/libmemcached_world.h \
-		 tests/namespace.h \
-		 tests/parser.h \
-		 tests/deprecated.h \
-		 tests/pool.h \
-		 tests/print.h \
-		 tests/replication.h \
-		 tests/server_add.h \
-		 tests/string.h \
-		 tests/virtual_buckets.h
+EXTRA_DIST+= tests/cpp_example.cc
+
+noinst_HEADERS+= tests/exist.h
+noinst_HEADERS+= tests/hash_results.h
+noinst_HEADERS+= tests/keys.hpp
+noinst_HEADERS+= tests/libmemcached_test_container.h
+noinst_HEADERS+= tests/libmemcached_world.h
+noinst_HEADERS+= tests/libmemcached_world_socket.h
+noinst_HEADERS+= tests/memc.h
+noinst_HEADERS+= tests/runner.h
 
 # Cycle should always run first
 tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
@@ -52,116 +39,42 @@ tests_cycle_LDADD+= ${PTHREAD_LIBS}
 check_PROGRAMS+= tests/cycle
 noinst_PROGRAMS+= tests/cycle
 
-# Test internals
-tests_internals_SOURCES= tests/internals.cc
-tests_internals_SOURCES+= tests/string.cc
-tests_internals_CXXFLAGS =  $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
-tests_internals_DEPENDENCIES= libmemcachedinternal/libmemcachedinternal.la libtest/libtest.la  libmemcachedinternal/libmemcachedutilinternal.la
-tests_internals_LDADD= libmemcachedinternal/libmemcachedinternal.la
-tests_internals_LDADD+= ${PTHREAD_LIBS}
-tests_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la
-tests_internals_LDADD+= libtest/libtest.la
-check_PROGRAMS+= tests/internals
-noinst_PROGRAMS+= tests/internals
-
-
-tests_testapp_CXXFLAGS =  $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
-tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_testapp_SOURCES= \
-		       tests/basic.cc \
-		       tests/debug.cc \
-		       tests/deprecated.cc \
-		       tests/error_conditions.cc \
-		       tests/exist.cc \
-		       tests/ketama.cc \
-		       tests/mem_functions.cc \
-		       tests/namespace.cc \
-		       tests/parser.cc \
-		       tests/pool.cc \
-		       tests/print.cc \
-		       tests/replication.cc \
-		       tests/server_add.cc \
-		       tests/virtual_buckets.cc
-tests_testapp_SOURCES+= clients/generator.cc clients/execute.cc
-tests_testapp_DEPENDENCIES= \
-			    libmemcached/libmemcached.la \
-			    libtest/libtest.la
-			    libhashkit/libhashkit.la \
-			    libmemcached/libmemcachedutil.la
-tests_testapp_LDADD= \
-		     ${PTHREAD_LIBS} \
-		     libmemcached/libmemcached.la \
-		     libmemcached/libmemcachedutil.la \
-		     libtest/libtest.la \
-		     libhashkit/libhashkit.la
-check_PROGRAMS+= tests/testapp
-noinst_PROGRAMS+= tests/testapp
-
-tests_sasl_CXXFLAGS =  $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
-tests_sasl_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_sasl_SOURCES= \
-		    tests/basic.cc \
-		    tests/debug.cc \
-		    tests/deprecated.cc \
-		    tests/error_conditions.cc \
-		    tests/ketama.cc \
-		    tests/sasl.cc \
-		    tests/namespace.cc \
-		    tests/parser.cc \
-		    tests/pool.cc \
-		    tests/print.cc \
-		    tests/replication.cc \
-		    tests/virtual_buckets.cc
-tests_sasl_SOURCES+= clients/generator.cc clients/execute.cc
-tests_sasl_DEPENDENCIES= \
-			 libmemcached/libmemcached.la \
-			 libtest/libtest.la
-tests_sasl_LDADD= \
-		  ${PTHREAD_LIBS} \
-		  libmemcached/libmemcached.la \
-		  libmemcached/libmemcachedutil.la \
-		  libtest/libtest.la \
-		  libhashkit/libhashkit.la
-check_PROGRAMS+= tests/sasl
-noinst_PROGRAMS+= tests/sasl
-
-tests_testplus_SOURCES= tests/plus.cpp
-tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_testplus_DEPENDENCIES= $(TESTS_LDADDS)
-tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES)
-check_PROGRAMS+= tests/testplus
-noinst_PROGRAMS+= tests/testplus
-
-tests_failure_SOURCES= tests/failure.cc
+include tests/libmemcached-1.0/include.am
+
+include tests/parser.am
+
+tests_failure_SOURCES=
+tests_failure_SOURCES+= tests/failure.cc
+tests_failure_SOURCES+= clients/execute.cc
+tests_failure_SOURCES+= clients/generator.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/generate.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/print.cc
+
 tests_failure_CXXFLAGS = $(AM_CXXFLAGS)
 tests_failure_DEPENDENCIES= $(TESTS_LDADDS)
 tests_failure_LDADD= $(tests_failure_DEPENDENCIES)
 check_PROGRAMS+= tests/failure
 noinst_PROGRAMS+= tests/failure
 
-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)
-noinst_PROGRAMS+= tests/atomsmasher
-
-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)
-check_PROGRAMS+= tests/testudp
-noinst_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)
+test-failure: tests/failure
+	@tests/failure
+
+gdb-failure: tests/failure
+	@$(DEBUG_COMMAND) tests/failure
+
+
+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
 noinst_PROGRAMS+= tests/testhashkit
 
+test-hash: tests/testhashkit
+	@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)
@@ -169,198 +82,43 @@ tests_hash_plus_LDADD= $(tests_testhashkit_DEPENDENCIES)
 check_PROGRAMS+= tests/hash_plus
 noinst_PROGRAMS+= tests/hash_plus
 
-tests_memcapable_SOURCES= tests/memcapable.cc
-tests_memcapable_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcapable_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
-tests_memcapable_LDADD=  $(tests_memcapable_DEPENDENCIES)
-check_PROGRAMS+= tests/memcapable
-noinst_PROGRAMS+= tests/memcapable
-
-tests_memstat_SOURCES= tests/memstat.cc
-tests_memstat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memstat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
-tests_memstat_LDADD=  $(tests_memstat_DEPENDENCIES)
-check_PROGRAMS+= tests/memstat
-noinst_PROGRAMS+= tests/memstat
-
-tests_memcp_SOURCES= tests/memcp.cc
-tests_memcp_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcp_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
-tests_memcp_LDADD=  $(tests_memcp_DEPENDENCIES)
-check_PROGRAMS+= tests/memcp
-noinst_PROGRAMS+= tests/memcp
-
-tests_memflush_SOURCES= tests/memflush.cc
-tests_memflush_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memflush_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
-tests_memflush_LDADD=  $(tests_memflush_DEPENDENCIES)
-check_PROGRAMS+= tests/memflush
-noinst_PROGRAMS+= tests/memflush
-
-tests_memrm_SOURCES= tests/memrm.cc
-tests_memrm_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memrm_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
-tests_memrm_LDADD=  $(tests_memrm_DEPENDENCIES)
-check_PROGRAMS+= tests/memrm
-noinst_PROGRAMS+= tests/memrm
-
-tests_memexist_SOURCES= tests/memexist.cc
-tests_memexist_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memexist_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
-tests_memexist_LDADD=  $(tests_memexist_DEPENDENCIES)
-check_PROGRAMS+= tests/memexist
-noinst_PROGRAMS+= tests/memexist
-
-tests_memcat_SOURCES= tests/memcat.cc
-tests_memcat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memcat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
-tests_memcat_LDADD=  $(tests_memcat_DEPENDENCIES)
-check_PROGRAMS+= tests/memcat
-noinst_PROGRAMS+= tests/memcat
-
-tests_memerror_SOURCES= tests/memerror.cc
-tests_memerror_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memerror_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
-tests_memerror_LDADD=  $(tests_memerror_DEPENDENCIES)
-check_PROGRAMS+= tests/memerror
-noinst_PROGRAMS+= tests/memerror
-
-tests_memslap_SOURCES= tests/memslap.cc
-tests_memslap_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memslap_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
-tests_memslap_LDADD=  $(tests_memslap_DEPENDENCIES)
-check_PROGRAMS+= tests/memslap
-noinst_PROGRAMS+= tests/memslap
-
-tests_memdump_SOURCES= tests/memdump.cc
-tests_memdump_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memdump_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
-tests_memdump_LDADD=  $(tests_memdump_DEPENDENCIES)
-check_PROGRAMS+= tests/memdump
-noinst_PROGRAMS+= tests/memdump
- 
-# Test linking with C application
-tests_c_test_SOURCES= tests/c_test.c
-tests_c_test_LDADD= libmemcached/libmemcached.la
-tests_c_test_DEPENDENCIES= libmemcached/libmemcached.la
-check_PROGRAMS+=tests/c_test
-noinst_PROGRAMS+=tests/c_test
-
-# Test linking with C application/SASL include
-tests_c_sasl_test_SOURCES= tests/c_sasl_test.c
-tests_c_sasl_test_LDADD= libmemcached/libmemcached.la
-tests_c_sasl_test_DEPENDENCIES= libmemcached/libmemcached.la
-check_PROGRAMS+=tests/c_sasl_test
-noinst_PROGRAMS+=tests/c_sasl_test
+include tests/cli.am
 
 test: check
 
 check-local: $(TEST_DOCS)
 	@echo "Tests completed"
 
-test-x: test-plus test-memcp test-memdump test-memflush test-memstat
-	@echo "Tests completed"
-
-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
-
-test-mem: tests/var tests/testapp
-	@tests/testapp
+test-mem: tests/libmemcached-1.0/testapp
+	@tests/libmemcached-1.0/testapp
 
 test-sasl: tests/sasl
 	@tests/sasl
 
-test-atom: tests/var tests/atomsmasher
+test-atom: tests/atomsmasher
 	@tests/atomsmasher
 
-test-plus: tests/var tests/testplus
-	@tests/testplus
-
-test-hash: tests/var tests/testhashkit
-	@tests/testhashkit
-
-test-hashplus: tests/var tests/hash_plus
+test-hashplus: tests/hash_plus
 	@tests/hash_plus
 
-test-cycle: tests/var tests/cycle
+test-cycle: tests/cycle
 	@tests/cycle
 
-test-memcapable: tests/var tests/memcapable
+test-memcapable: tests/memcapable
 	@tests/memcapable
 
 pahole-mem: tests/testapp
 	@$(PAHOLE_COMMAND)  tests/testapp
 
-gdb-mem: tests/testapp
-	@$(DEBUG_COMMAND)  tests/testapp
+gdb-mem: tests/libmemcached-1.0/testapp
+	@$(DEBUG_COMMAND)  tests/libmemcached-1.0/testapp
 
 gdb-sasl: tests/sasl
 	@$(DEBUG_COMMAND)  tests/sasl
 
 gdb-atom: tests/atomsmasher
-	@$(DEBUG_COMMAND) tests/testudp
-
-gdb-udp: tests/testudp
 	@$(DEBUG_COMMAND) tests/atomsmasher
 
-gdb-plus: tests/testplus
-	$(DEBUG_COMMAND) tests/testplus
-
 gdb-hash: tests/testhashkit
 	@$(DEBUG_COMMAND) tests/testhashkit
 
@@ -370,14 +128,11 @@ gdb-hashplus: tests/hash_plus
 gdb-cycle: tests/cycle
 	@$(DEBUG_COMMAND) tests/cycle
 
-gdb-failure: tests/failure
-	@$(DEBUG_COMMAND) tests/failure
-
 valgrind-cycle: tests/cycle
 	$(VALGRIND_COMMAND) tests/cycle
 
-valgrind-mem: tests/testapp
-	@$(VALGRIND_COMMAND) tests/testapp
+valgrind-mem: tests/libmemcached-1.0/testapp
+	@$(VALGRIND_COMMAND) tests/libmemcached-1.0/testapp
 
 valgrind-failure: tests/failure
 	@$(VALGRIND_COMMAND) tests/failure
@@ -385,12 +140,6 @@ valgrind-failure: tests/failure
 valgrind-atom: tests/atomsmasher
 	$(VALGRIND_COMMAND) tests/atomsmasher
 
-valgrind-udp: tests/testudp
-	$(VALGRIND_COMMAND) tests/testudp
-
-valgrind-plus: tests/testplus
-	@$(VALGRIND_COMMAND) tests/testplus
-
 valgrind-sasl: tests/sasl
 	@$(VALGRIND_COMMAND) tests/sasl
 
@@ -403,18 +152,12 @@ valgrind-hashplus: tests/hash_plus
 helgrind-cycle: tests/cycle
 	@$(HELGRIND_COMMAND) tests/cycle
 
-helgrind-mem: tests/testapp
-	@$(HELGRIND_COMMAND) tests/testapp
+helgrind-mem: tests/libmemcached-1.0/testapp
+	@$(HELGRIND_COMMAND) tests/libmemcached-1.0/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