Merge in new scanner/parser suite with updated test cases.

[awesomized/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index 648751159842542813ce1b4b9a22003c535bd4b2..a88a804b1db44b0eec3c9134242eb6c81f5db2dd 100644 (file)
--- 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
 
@@ -14,13 +23,17 @@ if BUILD_LIBMEMCACHEDUTIL
 TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 endif
 
+EXTRA_DIST+= \
+            tests/cpp_example.cc \
+            tests/output_plus.res
+
 noinst_HEADERS+= \
                 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
 
 noinst_PROGRAMS+= \
                  tests/atomsmasher \
@@ -32,51 +45,48 @@ 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/mem_functions.c \
+                      tests/parser.cc \
+                      tests/print.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
@@ -86,12 +96,12 @@ 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
 
-check-local: test-docs test-mem test-hash memcapable
+check-local: $(TEST_DOCS) test-mem test-hash memcapable
        @echo "Tests completed"
 
 test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat