X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=9e87ca17b2e297e21f31480156bd97982709def4;hb=7253c10fe79f6a72b0aec419560823a16ad55a0a;hp=96cbd70bffaa3314b3271e9070ccee135203d75c;hpb=1c437e033ddfd084c0d77d9a7ed1a062c22ab015;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index 96cbd70b..9e87ca17 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -8,24 +8,23 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-TESTS_LDADDS= \
-	      libmemcached/libmemcached.la \
-	      libmemcached/libmemcachedutil.la \
-	      libtest/libtest.la
+TESTS_LDADDS=
+TESTS_LDADDS+= libmemcached/libmemcached.la
+TESTS_LDADDS+= libmemcached/libmemcachedutil.la
+TESTS_LDADDS+= libtest/libtest.la
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
 PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
 
-EXTRA_DIST+= \
-	     tests/cpp_example.cc \
-	     tests/output_plus.res
+EXTRA_DIST+= tests/cpp_example.cc
 
-noinst_HEADERS+= \
-		 tests/exist.h \
-		 tests/hash_results.h \
-		 tests/libmemcached_world.h \
-		 tests/libmemcached_world_socket.h
+noinst_HEADERS+= tests/exist.h
+noinst_HEADERS+= tests/keys.hpp
+noinst_HEADERS+= tests/hash_results.h
+noinst_HEADERS+= tests/libmemcached_world.h
+noinst_HEADERS+= tests/libmemcached_world_socket.h
+noinst_HEADERS+= tests/runner.h
 
 # Cycle should always run first
 tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
@@ -40,7 +39,14 @@ noinst_PROGRAMS+= tests/cycle
 
 include tests/libmemcached-1.0/include.am
 
-tests_failure_SOURCES= tests/failure.cc
+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_CXXFLAGS = $(AM_CXXFLAGS)
 tests_failure_DEPENDENCIES= $(TESTS_LDADDS)
 tests_failure_LDADD= $(tests_failure_DEPENDENCIES)
@@ -67,28 +73,28 @@ test: check
 check-local: $(TEST_DOCS)
 	@echo "Tests completed"
 
-test-mem: tests/var tests/libmemcached-1.0/testapp
+test-mem: tests/libmemcached-1.0/testapp
 	@tests/libmemcached-1.0/testapp
 
 test-sasl: tests/sasl
 	@tests/sasl
 
-test-atom: tests/var tests/atomsmasher
+test-atom: tests/atomsmasher
 	@tests/atomsmasher
 
-test-plus: tests/var tests/testplus
+test-plus: tests/testplus
 	@tests/testplus
 
-test-hash: tests/var tests/testhashkit
+test-hash: tests/testhashkit
 	@tests/testhashkit
 
-test-hashplus: tests/var tests/hash_plus
+test-hashplus: tests/hash_plus
 	@tests/hash_plus
 
-test-cycle: tests/var tests/cycle
+test-cycle: tests/cycle
 	@tests/cycle
 
-test-memcapable: tests/var tests/memcapable
+test-memcapable: tests/memcapable
 	@tests/memcapable
 
 pahole-mem: tests/testapp