X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=3a8c8efab76012b40ee532ec5c04b45b5f3c9961;hb=fa6ba3db53a843986bba34cc6c666a89624326f4;hp=c6e59f9969e7cc5d99da363b9c32f79c8f73a159;hpb=8853fb2dda92e1c9921893c42efd48bcd72afaf9;p=awesomized%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index c6e59f99..3a8c8efa 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -18,13 +18,14 @@ DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
 
 EXTRA_DIST+= tests/cpp_example.cc
-EXTRA_DIST+= tests/output_plus.res
 
 noinst_HEADERS+= tests/exist.h
-noinst_HEADERS+= tests/keys.hpp
 noinst_HEADERS+= tests/hash_results.h
+noinst_HEADERS+= tests/keys.hpp
+noinst_HEADERS+= tests/libmemcached_test_container.h
 noinst_HEADERS+= tests/libmemcached_world.h
 noinst_HEADERS+= tests/libmemcached_world_socket.h
+noinst_HEADERS+= tests/memc.h
 noinst_HEADERS+= tests/runner.h
 
 # Cycle should always run first
@@ -40,19 +41,40 @@ noinst_PROGRAMS+= tests/cycle
 
 include tests/libmemcached-1.0/include.am
 
-tests_failure_SOURCES= tests/failure.cc
+include tests/parser.am
+
+tests_failure_SOURCES=
+tests_failure_SOURCES+= tests/failure.cc
+tests_failure_SOURCES+= clients/execute.cc
+tests_failure_SOURCES+= clients/generator.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/callback_counter.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/generate.cc
+tests_failure_SOURCES+= tests/libmemcached-1.0/print.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_testhashkit_SOURCES = tests/hashkit_functions.cc
-tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
-tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES)
+test-failure: tests/failure
+	@tests/failure
+
+gdb-failure: tests/failure
+	@$(DEBUG_COMMAND) tests/failure
+
+
+tests_testhashkit_SOURCES= tests/hashkit_functions.cc
+tests_testhashkit_DEPENDENCIES= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
+tests_testhashkit_LDADD= $(tests_testhashkit_DEPENDENCIES)
 check_PROGRAMS+= tests/testhashkit
 noinst_PROGRAMS+= tests/testhashkit
 
+test-hash: tests/testhashkit
+	@tests/testhashkit
+
+
 tests_hash_plus_SOURCES= tests/hash_plus.cc
 tests_hash_plus_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_hash_plus_DEPENDENCIES= $(tests_testhashkit_DEPENDENCIES)
@@ -64,9 +86,6 @@ include tests/cli.am
 
 test: check
 
-check-local: $(TEST_DOCS)
-	@echo "Tests completed"
-
 test-mem: tests/libmemcached-1.0/testapp
 	@tests/libmemcached-1.0/testapp
 
@@ -76,12 +95,6 @@ test-sasl: tests/sasl
 test-atom: tests/atomsmasher
 	@tests/atomsmasher
 
-test-plus: tests/testplus
-	@tests/testplus
-
-test-hash: tests/testhashkit
-	@tests/testhashkit
-
 test-hashplus: tests/hash_plus
 	@tests/hash_plus
 
@@ -91,6 +104,9 @@ test-cycle: tests/cycle
 test-memcapable: tests/memcapable
 	@tests/memcapable
 
+valgrind-memcapable: tests/memcapable
+	$(VALGRIND_COMMAND) tests/memcapable
+
 pahole-mem: tests/testapp
 	@$(PAHOLE_COMMAND)  tests/testapp
 
@@ -103,9 +119,6 @@ gdb-sasl: tests/sasl
 gdb-atom: tests/atomsmasher
 	@$(DEBUG_COMMAND) tests/atomsmasher
 
-gdb-plus: tests/testplus
-	$(DEBUG_COMMAND) tests/testplus
-
 gdb-hash: tests/testhashkit
 	@$(DEBUG_COMMAND) tests/testhashkit
 
@@ -115,9 +128,6 @@ 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
 
@@ -130,9 +140,6 @@ valgrind-failure: tests/failure
 valgrind-atom: tests/atomsmasher
 	$(VALGRIND_COMMAND) tests/atomsmasher
 
-valgrind-plus: tests/testplus
-	@$(VALGRIND_COMMAND) tests/testplus
-
 valgrind-sasl: tests/sasl
 	@$(VALGRIND_COMMAND) tests/sasl
 
@@ -151,9 +158,6 @@ helgrind-mem: tests/libmemcached-1.0/testapp
 helgrind-atom: tests/atomsmasher
 	@$(HELGRIND_COMMAND) tests/atomsmasher
 
-helgrind-plus: tests/testplus
-	@$(HELGRIND_COMMAND) tests/testplus
-
 helgrind-hash: tests/testhashkit
 	@$(HELGRIND_COMMAND) tests/testhashkit