Update libtest.

[m6w6/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index 7bc9e60b99dcddf2f338ada4accedcb3759239f4..938014222884057540dacd87b822229bdabf9741 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -8,24 +8,25 @@
 # 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/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
 tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
@@ -40,19 +41,38 @@ 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_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)
@@ -67,34 +87,31 @@ 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
-       @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
        @$(PAHOLE_COMMAND)  tests/testapp
 
-gdb-mem: tests/var tests/libmemcached-1.0/testapp
+gdb-mem: tests/libmemcached-1.0/testapp
        @$(DEBUG_COMMAND)  tests/libmemcached-1.0/testapp
 
 gdb-sasl: tests/sasl
@@ -115,14 +132,11 @@ 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-mem: tests/libmemcached-1.0/testapp
+       @$(VALGRIND_COMMAND) tests/libmemcached-1.0/testapp
 
 valgrind-failure: tests/failure
        @$(VALGRIND_COMMAND) tests/failure
@@ -145,8 +159,8 @@ valgrind-hashplus: tests/hash_plus
 helgrind-cycle: tests/cycle
        @$(HELGRIND_COMMAND) tests/cycle
 
-helgrind-mem: tests/testapp
-       @$(HELGRIND_COMMAND) tests/testapp
+helgrind-mem: tests/libmemcached-1.0/testapp
+       @$(HELGRIND_COMMAND) tests/libmemcached-1.0/testapp
 
 helgrind-atom: tests/atomsmasher
        @$(HELGRIND_COMMAND) tests/atomsmasher