Merge in updates (including removal of some depcrated bits from the examples).

[m6w6/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index 93a08c6e29db105c991297b6b33abe9e1786a090..2a3e5cb8aa2524561f29faa478de341507db303c 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -35,6 +35,8 @@ noinst_HEADERS+= \
                 tests/ketama_test_cases_spy.h \
                 tests/libmemcached_world.h \
                 tests/parser.h \
+                tests/deprecated.h \
+                tests/pool.h \
                 tests/print.h \
                 tests/replication.h \
                 tests/string.h \
@@ -53,9 +55,11 @@ noinst_PROGRAMS+= \
 tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testapp_SOURCES= \
                       tests/basic.cc \
+                      tests/deprecated.cc \
                       tests/error_conditions.cc \
                       tests/mem_functions.c \
                       tests/parser.cc \
+                      tests/pool.cc \
                       tests/print.cc \
                       tests/replication.cc \
                       tests/string.cc \
@@ -241,7 +245,7 @@ UDP_COMMAND= tests/testudp $(COLLECTION) $(SUITE)
 
 HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
 
-test-mem: tests/testapp support/example.cnf
+test-mem: tests/testapp
        $(MEM_COMMAND)
 
 test-udp: tests/testudp