X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Finclude.am;h=490ed023d527adcb1a6c28a7a47eb9ad8cfd2a95;hb=abc87c2867661669e897142dbfd531e32a14981b;hp=e6c5367f23c750e5a7be951e995a60300fae2952;hpb=455c7b4d466a7d6b11b95f8292eb2e2da607f949;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index e6c5367f..490ed023 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -1,8 +1,17 @@
 # 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
+TESTS_LDADDS= \
+	      libmemcached/libmemcached.la \
+	      libtest/libserver.la \
+	      libtest/libtest.la
 
 VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --track-fds=yes
 
@@ -19,12 +28,18 @@ EXTRA_DIST+= \
 	     tests/output_plus.res
 
 noinst_HEADERS+= \
+		 tests/basic.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/parser.h \
+		 tests/print.h \
+		 tests/replication.h \
+		 tests/string.h \
+		 tests/virtual_buckets.h
+
 
 noinst_PROGRAMS+= \
 		  tests/atomsmasher \
@@ -36,51 +51,53 @@ noinst_PROGRAMS+= \
 		  tests/testplus \
 		  tests/testudp
 
-noinst_LTLIBRARIES+= tests/libserver.la
-tests_libserver_la_SOURCES= tests/server.c
-
-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/error_conditions.cc \
+		       tests/mem_functions.c \
+		       tests/parser.cc \
+		       tests/print.cc \
+		       tests/replication.cc \
+		       tests/string.cc \
+		       tests/virtual_buckets.cc
+
 tests_testapp_DEPENDENCIES= \
 			    $(BUILT_SOURCES) \
 			    clients/libgenexec.la \
-			    tests/libserver.la \
-			    tests/libtest.la \
 			    libmemcached/libmemcachedinternal.la \
 			    $(TESTS_LDADDS)
-tests_testapp_LDADD= $(tests_testapp_DEPENDENCIES) $(LIBSASL)
+
+tests_testapp_LDADD= clients/libgenexec.la \
+		     libmemcached/libmemcachedinternal.la \
+		     $(TESTS_LDADDS) $(LIBSASL)
 
 tests_testplus_SOURCES= tests/plus.cpp
 tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_testplus_DEPENDENCIES= tests/libtest.la tests/libserver.la $(TESTS_LDADDS)
+tests_testplus_DEPENDENCIES= $(TESTS_LDADDS)
 tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) $(LIBSASL)
 
 tests_atomsmasher_SOURCES= tests/atomsmasher.c
 tests_atomsmasher_DEPENDENCIES= \
 				clients/libgenexec.la \
-				tests/libserver.la \
-				tests/libtest.la \
 				$(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.c
 tests_testudp_DEPENDENCIES= \
 			    clients/libgenexec.la \
-			    tests/libserver.la \
-			    tests/libtest.la \
 			    $(TESTS_LDADDS)
+
 tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL)
 
 tests_startservers_SOURCES= tests/start.c
-tests_startservers_DEPENDENCIES= tests/libserver.la $(TESTS_LDADDS)
+tests_startservers_DEPENDENCIES= $(TESTS_LDADDS)
 tests_startservers_LDADD= $(tests_startservers_DEPENDENCIES) $(LIBSASL)
 
 tests_testhashkit_SOURCES = tests/hashkit_functions.c
-tests_testhashkit_DEPENDENCIES = tests/libtest.la libhashkit/libhashkit.la
+tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la
 tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
 
 tests_hashplus_SOURCES = tests/hash_plus.cc
@@ -90,7 +107,7 @@ tests_hashplus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
 
 tests_memplus_SOURCES = tests/mem_plus.cc
 tests_memplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memplus_DEPENDENCIES = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la
+tests_memplus_DEPENDENCIES = $(TESTS_LDADDS)
 tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES) $(LIBSASL)
 
 test: check
@@ -231,7 +248,7 @@ UDP_COMMAND= tests/testudp $(COLLECTION) $(SUITE)
 
 HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
 
-test-mem: tests/testapp
+test-mem: tests/testapp support/example.cnf
 	$(MEM_COMMAND)
 
 test-udp: tests/testudp