X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Flibmemcached-1.0%2Finclude.am;h=d4b3fc14468b33653c37111c7f7a3b0e6b5e79a5;hb=a713b6d9ee850ae5805c05e8336256cea1f71138;hp=81653a1c8e68987bd2dedc4f90523d6a53724be2;hpb=dbd192a1c0caf4eb95c433d21d124c359c00381d;p=m6w6%2Flibmemcached

diff --git a/tests/libmemcached-1.0/include.am b/tests/libmemcached-1.0/include.am
index 81653a1c..d4b3fc14 100644
--- a/tests/libmemcached-1.0/include.am
+++ b/tests/libmemcached-1.0/include.am
@@ -12,20 +12,31 @@ noinst_HEADERS+= \
 		 tests/basic.h \
 		 tests/callbacks.h \
 		 tests/debug.h \
+		 tests/deprecated.h \
 		 tests/error_conditions.h \
 		 tests/exist.h \
 		 tests/ketama.h \
 		 tests/ketama_test_cases.h \
 		 tests/ketama_test_cases_spy.h \
+		 tests/libmemcached-1.0/all_tests.h \
+		 tests/libmemcached-1.0/callback_counter.h \
+		 tests/libmemcached-1.0/dump.h \
+		 tests/libmemcached-1.0/fetch_all_results.h \
+		 tests/libmemcached-1.0/generate.h \
+		 tests/libmemcached-1.0/encoding_key.h \
+		 tests/libmemcached-1.0/haldenbrand.h \
+		 tests/libmemcached-1.0/mem_functions.h \
+		 tests/libmemcached-1.0/memcached_get.h \
+		 tests/libmemcached-1.0/setup_and_teardowns.h \
+		 tests/libmemcached-1.0/stat.h \
 		 tests/namespace.h \
 		 tests/parser.h \
-		 tests/touch.h \
-		 tests/deprecated.h \
 		 tests/pool.h \
 		 tests/print.h \
 		 tests/replication.h \
 		 tests/server_add.h \
 		 tests/string.h \
+		 tests/touch.h \
 		 tests/virtual_buckets.h
 
 # Test internals
@@ -43,23 +54,34 @@ noinst_PROGRAMS+= tests/libmemcached-1.0/internals
 
 tests_libmemcached_1_0_testapp_CXXFLAGS =  $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
 tests_libmemcached_1_0_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_libmemcached_1_0_testapp_SOURCES= \
-                                        tests/libmemcached-1.0/basic.cc \
-                                        tests/libmemcached-1.0/callbacks.cc \
-                                        tests/libmemcached-1.0/debug.cc \
-                                        tests/libmemcached-1.0/deprecated.cc \
-                                        tests/libmemcached-1.0/error_conditions.cc \
-                                        tests/libmemcached-1.0/exist.cc \
-                                        tests/libmemcached-1.0/ketama.cc \
-                                        tests/libmemcached-1.0/mem_functions.cc \
-                                        tests/libmemcached-1.0/namespace.cc \
-					tests/libmemcached-1.0/pool.cc \
-					tests/libmemcached-1.0/print.cc \
-					tests/libmemcached-1.0/replication.cc \
-                                        tests/libmemcached-1.0/parser.cc \
-                                        tests/libmemcached-1.0/server_add.cc \
-                                        tests/libmemcached-1.0/touch.cc \
-                                        tests/libmemcached-1.0/virtual_buckets.cc
+tests_libmemcached_1_0_testapp_SOURCES=
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/all_tests.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_libmemcached_1_0_testapp_SOURCES+= tests/libmemcached-1.0/generate.cc
+tests_libmemcached_1_0_testapp_SOURCES+= \
+					 tests/libmemcached-1.0/basic.cc \
+					 tests/libmemcached-1.0/callbacks.cc \
+					 tests/libmemcached-1.0/debug.cc \
+					 tests/libmemcached-1.0/deprecated.cc \
+					 tests/libmemcached-1.0/dump.cc \
+					 tests/libmemcached-1.0/encoding_key.cc \
+					 tests/libmemcached-1.0/error_conditions.cc \
+					 tests/libmemcached-1.0/exist.cc \
+					 tests/libmemcached-1.0/haldenbrand.cc \
+					 tests/libmemcached-1.0/ketama.cc \
+					 tests/libmemcached-1.0/mem_functions.cc \
+					 tests/libmemcached-1.0/memcached_get.cc \
+					 tests/libmemcached-1.0/namespace.cc \
+					 tests/libmemcached-1.0/parser.cc \
+					 tests/libmemcached-1.0/pool.cc \
+					 tests/libmemcached-1.0/print.cc \
+					 tests/libmemcached-1.0/replication.cc \
+					 tests/libmemcached-1.0/server_add.cc \
+					 tests/libmemcached-1.0/setup_and_teardowns.cc \
+					 tests/libmemcached-1.0/stat.cc \
+					 tests/libmemcached-1.0/touch.cc \
+					 tests/libmemcached-1.0/virtual_buckets.cc
 
 tests_libmemcached_1_0_testapp_SOURCES+= clients/generator.cc clients/execute.cc
 tests_libmemcached_1_0_testapp_DEPENDENCIES= \
@@ -69,6 +91,7 @@ tests_libmemcached_1_0_testapp_DEPENDENCIES= \
                                              libmemcached/libmemcachedutil.la
 
 tests_libmemcached_1_0_testapp_LDADD= \
+				      $(LIBUUID_LDFLAGS) \
                                       ${PTHREAD_LIBS} \
                                       libmemcached/libmemcached.la \
                                       libmemcached/libmemcachedutil.la \
@@ -78,6 +101,55 @@ tests_libmemcached_1_0_testapp_LDADD= \
 check_PROGRAMS+= tests/libmemcached-1.0/testapp
 noinst_PROGRAMS+= tests/libmemcached-1.0/testapp
 
+tests_libmemcached_1_0_testsocket_CXXFLAGS =  $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
+tests_libmemcached_1_0_testsocket_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+tests_libmemcached_1_0_testsocket_SOURCES= \
+					   tests/libmemcached-1.0/all_tests_socket.cc \
+					   tests/libmemcached-1.0/basic.cc \
+					   tests/libmemcached-1.0/callbacks.cc \
+					   tests/libmemcached-1.0/debug.cc \
+					   tests/libmemcached-1.0/deprecated.cc \
+					   tests/libmemcached-1.0/dump.cc \
+					   tests/libmemcached-1.0/encoding_key.cc \
+					   tests/libmemcached-1.0/error_conditions.cc \
+					   tests/libmemcached-1.0/exist.cc \
+					   tests/libmemcached-1.0/haldenbrand.cc \
+					   tests/libmemcached-1.0/ketama.cc \
+					   tests/libmemcached-1.0/mem_functions.cc \
+					   tests/libmemcached-1.0/memcached_get.cc \
+					   tests/libmemcached-1.0/namespace.cc \
+					   tests/libmemcached-1.0/parser.cc \
+					   tests/libmemcached-1.0/pool.cc \
+					   tests/libmemcached-1.0/print.cc \
+					   tests/libmemcached-1.0/replication.cc \
+					   tests/libmemcached-1.0/server_add.cc \
+					   tests/libmemcached-1.0/setup_and_teardowns.cc \
+					   tests/libmemcached-1.0/stat.cc \
+					   tests/libmemcached-1.0/touch.cc \
+					   tests/libmemcached-1.0/virtual_buckets.cc
+
+tests_libmemcached_1_0_testsocket_SOURCES+= clients/generator.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= clients/execute.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/generate.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_libmemcached_1_0_testsocket_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_libmemcached_1_0_testsocket_DEPENDENCIES= \
+						libmemcached/libmemcached.la \
+						libtest/libtest.la \
+						libhashkit/libhashkit.la \
+						libmemcached/libmemcachedutil.la
+
+tests_libmemcached_1_0_testsocket_LDADD= \
+					 $(LIBUUID_LDFLAGS) \
+					 ${PTHREAD_LIBS} \
+					 libmemcached/libmemcached.la \
+					 libmemcached/libmemcachedutil.la \
+					 libtest/libtest.la \
+					 libhashkit/libhashkit.la
+
+check_PROGRAMS+= tests/libmemcached-1.0/testsocket
+noinst_PROGRAMS+= tests/libmemcached-1.0/testsocket
+
 tests_libmemcached_1_0_sasl_CXXFLAGS =  $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
 tests_libmemcached_1_0_sasl_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_libmemcached_1_0_sasl_SOURCES= \
@@ -93,7 +165,12 @@ tests_libmemcached_1_0_sasl_SOURCES= \
 				     tests/libmemcached-1.0/replication.cc \
 				     tests/libmemcached-1.0/sasl.cc \
 				     tests/libmemcached-1.0/virtual_buckets.cc
-tests_libmemcached_1_0_sasl_SOURCES+= clients/generator.cc clients/execute.cc
+tests_libmemcached_1_0_sasl_SOURCES+= clients/execute.cc
+tests_libmemcached_1_0_sasl_SOURCES+= clients/generator.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_libmemcached_1_0_sasl_SOURCES+= tests/libmemcached-1.0/generate.cc
+
 tests_libmemcached_1_0_sasl_DEPENDENCIES= \
 					  libmemcached/libmemcached.la \
 					  libtest/libtest.la
@@ -117,7 +194,15 @@ 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_SOURCES=
+
+tests_testudp_SOURCES+= tests/mem_udp.cc
+tests_testudp_SOURCES+= clients/execute.cc
+tests_testudp_SOURCES+= clients/generator.cc
+tests_testudp_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_testudp_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_testudp_SOURCES+= tests/libmemcached-1.0/generate.cc
+
 tests_testudp_DEPENDENCIES= $(TESTS_LDADDS)
 tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES)
 check_PROGRAMS+= tests/testudp
@@ -126,7 +211,15 @@ noinst_PROGRAMS+= tests/testudp
 test-udp: tests/testudp
 	@tests/testudp
 
-tests_testplus_SOURCES= tests/libmemcached-1.0/plus.cpp
+tests_testplus_SOURCES=
+
+tests_testplus_SOURCES+= tests/libmemcached-1.0/plus.cpp
+tests_testplus_SOURCES+= clients/execute.cc
+tests_testplus_SOURCES+= clients/generator.cc
+tests_testplus_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_testplus_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_testplus_SOURCES+= tests/libmemcached-1.0/generate.cc
+
 tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_testplus_DEPENDENCIES= $(TESTS_LDADDS)
 tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES)