Merge in fixes for deprecated bits in behavior.

[awesomized/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index f940caf88b3bb03e0edf57db232291a727d13fc9..7451efd3f6a84e6d90741d4da62d1e680fb37186 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -28,15 +28,22 @@ 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/libmemcached_world.h \
+                tests/parser.h \
+                tests/print.h \
+                tests/replication.h \
+                tests/string.h \
+                tests/virtual_buckets.h
+
 
 noinst_PROGRAMS+= \
                  tests/atomsmasher \
-                 tests/hashplus \
-                 tests/memplus \
+                 tests/hash_plus \
                  tests/startservers \
                  tests/testapp \
                  tests/testhashkit \
@@ -44,7 +51,16 @@ noinst_PROGRAMS+= \
                  tests/testudp
 
 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 \
@@ -83,15 +99,11 @@ tests_testhashkit_SOURCES = tests/hashkit_functions.c
 tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la
 tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
 
-tests_hashplus_SOURCES = tests/hash_plus.cc
-tests_hashplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_hashplus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES)
-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_LDADDS)
-tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES) $(LIBSASL)
+tests_hash_plus_SOURCES = tests/hash_plus.cc
+tests_hash_plus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_hash_plus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES)
+tests_hash_plus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
+check_PROGRAMS+= tests/hash_plus
 
 test: check
 
@@ -221,8 +233,6 @@ MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
 
 TESTPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
 
-MEMPLUS_COMMAND= tests/memplus $(COLLECTION) $(SUITE)
-
 HASHPLUS_COMMAND= tests/hashplus $(COLLECTION) $(SUITE)
 
 ATOM_COMMAND= tests/atomsmasher $(COLLECTION) $(SUITE)
@@ -231,7 +241,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
@@ -249,9 +259,6 @@ test-hash: tests/testhashkit
 test-hashplus: tests/hashplus
        $(HASHPLUS_COMMAND)
 
-test-memplus: tests/memplus
-       $(MEMPLUS_COMMAND)
-
 pahole-mem: tests/testapp
        $(PAHOLE_COMMAND)  $(MEM_COMMAND)
 
@@ -273,9 +280,6 @@ gdb-hash: tests/testhashkit
 gdb-hashplus: tests/hashplus
        $(DEBUG_COMMAND) $(HASHPLUS_COMMAND)
 
-gdb-memplus: tests/memplus
-       $(DEBUG_COMMAND) $(MEMPLUS_COMMAND)
-
 gdb-memslap: clients/memslap
        $(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
 
@@ -297,9 +301,6 @@ valgrind-hash: tests/testhashkit
 valgrind-hashplus: tests/hashplus
        $(VALGRIND_COMMAND) $(HASHPLUS_COMMAND)
 
-valgrind-memplus: tests/memplus
-       $(VALGRIND_COMMAND) $(MEMPLUS_COMMAND)
-
 valgrind-memslap: clients/memslap
        $(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)