Merge in all of the build tree.

[awesomized/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index b5f4fb0d44d1b5eb69c5a222c54b5d1cf05dfc1a..38a07f9912bcb230e43e992913d501a82a8675fc 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -36,6 +36,7 @@ noinst_HEADERS+= \
                 tests/pool.h \
                 tests/print.h \
                 tests/replication.h \
+                tests/server_add.h \
                 tests/string.h \
                 tests/virtual_buckets.h
 
@@ -77,6 +78,7 @@ tests_testapp_SOURCES= \
                       tests/pool.cc \
                       tests/print.cc \
                       tests/replication.cc \
+                      tests/server_add.cc \
                       tests/virtual_buckets.cc
 tests_testapp_SOURCES+= clients/generator.cc clients/execute.cc
 tests_testapp_DEPENDENCIES= \
@@ -128,6 +130,13 @@ tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES)
 check_PROGRAMS+= tests/testplus
 noinst_PROGRAMS+= tests/testplus
 
+tests_failure_SOURCES= tests/failure.cc
+tests_failure_CXXFLAGS = $(AM_CXXFLAGS)
+tests_failure_DEPENDENCIES= $(TESTS_LDADDS)
+tests_failure_LDADD= $(tests_failure_DEPENDENCIES)
+check_PROGRAMS+= tests/failure
+noinst_PROGRAMS+= tests/failure
+
 tests_atomsmasher_SOURCES= \
                           tests/atomsmasher.cc \
                           tests/debug.cc \
@@ -353,12 +362,18 @@ gdb-hashplus: tests/hash_plus
 gdb-cycle: tests/cycle
        @$(DEBUG_COMMAND) tests/cycle
 
+gdb-failure: tests/failure
+       @$(DEBUG_COMMAND) tests/failure
+
 valgrind-cycle: tests/cycle
        $(VALGRIND_COMMAND) tests/cycle
 
 valgrind-mem: tests/testapp
        @$(VALGRIND_COMMAND) tests/testapp
 
+valgrind-failure: tests/failure
+       @$(VALGRIND_COMMAND) tests/failure
+
 valgrind-atom: tests/atomsmasher
        $(VALGRIND_COMMAND) tests/atomsmasher
 
@@ -368,15 +383,15 @@ valgrind-udp: tests/testudp
 valgrind-plus: tests/testplus
        @$(VALGRIND_COMMAND) tests/testplus
 
+valgrind-sasl: tests/sasl
+       @$(VALGRIND_COMMAND) tests/sasl
+
 valgrind-hash: tests/testhashkit
        @$(VALGRIND_COMMAND) tests/testhashkit
 
 valgrind-hashplus: tests/hash_plus
        @$(VALGRIND_COMMAND) tests/hash_plus
 
-.PHONY += valgrind
-valgrind: valgrind-cycle valgrind-mem valgrind-udp valgrind-plus valgrind-hash valgrind-hashplus
-
 helgrind-cycle: tests/cycle
        @$(HELGRIND_COMMAND) tests/cycle