Merge in all updates for autoconf
[m6w6/libmemcached] / tests / include.am
index 93f26bed0dc697c9604398bf2b83db3c973fbde6..316da33cc4f3dce4d59afe0b42c5f1553c9836c4 100644 (file)
 
 TESTS_LDADDS= \
              libmemcached/libmemcached.la \
+             libmemcached/libmemcachedutil.la \
              libtest/libtest.la
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
 PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
 
-if BUILD_LIBMEMCACHEDUTIL
-TESTS_LDADDS+= libmemcached/libmemcachedutil.la
-endif
-
 EXTRA_DIST+= \
             tests/cpp_example.cc \
             tests/output_plus.res
@@ -41,58 +38,66 @@ noinst_HEADERS+= \
                 tests/string.h \
                 tests/virtual_buckets.h
 
-
-noinst_PROGRAMS+= \
-                 tests/atomsmasher \
-                 tests/cycle \
-                 tests/hash_plus \
-                 tests/testapp \
-                 tests/testhashkit \
-                 tests/testplus \
-                 tests/testudp
-
 # Cycle should always run first
 tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
+tests_cycle_CXXFLAGS =  $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
 tests_cycle_SOURCES= tests/cycle.cc
 tests_cycle_DEPENDENCIES= $(TESTS_LDADDS)
 tests_cycle_LDADD= $(tests_cycle_DEPENDENCIES)
+tests_cycle_LDADD+= ${PTHREAD_LIBS}
 check_PROGRAMS+= tests/cycle
-
-
+noinst_PROGRAMS+= tests/cycle
+
+# Test internals
+tests_internals_SOURCES= tests/internals.cc
+tests_internals_SOURCES+= tests/string.cc
+tests_internals_CXXFLAGS =  $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
+tests_internals_DEPENDENCIES= libmemcachedinternal/libmemcachedinternal.la libtest/libtest.la  libmemcachedinternal/libmemcachedutilinternal.la
+tests_internals_LDADD= libmemcachedinternal/libmemcachedinternal.la
+tests_internals_LDADD+= ${PTHREAD_LIBS}
+tests_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la
+tests_internals_LDADD+= libtest/libtest.la
+check_PROGRAMS+= tests/internals
+noinst_PROGRAMS+= tests/internals
+
+
+tests_testapp_CXXFLAGS =  $(AM_CXXFLAGS) ${PTHREAD_CFLAGS}
 tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testapp_SOURCES= \
                       tests/basic.cc \
                       tests/debug.cc \
                       tests/deprecated.cc \
                       tests/error_conditions.cc \
+                      tests/ketama.cc \
                       tests/mem_functions.cc \
                       tests/namespace.cc \
                       tests/parser.cc \
                       tests/pool.cc \
                       tests/print.cc \
                       tests/replication.cc \
-                      tests/string.cc \
                       tests/virtual_buckets.cc
 tests_testapp_SOURCES+= clients/generator.cc clients/execute.cc
-
 tests_testapp_DEPENDENCIES= \
-                           $(BUILT_SOURCES) \
-                           $(TESTS_LDADDS) \
+                           libmemcached/libmemcached.la \
+                           libtest/libtest.la
                            libhashkit/libhashkit.la \
-                           libmemcached/libmemcachedinternal.la
-
+                           libmemcached/libmemcachedutil.la
 tests_testapp_LDADD= \
                     $(LIBSASL) \
-                    $(TESTS_LDADDS) \
-                    libhashkit/libhashkit.la \
-                    libmemcached/libmemcachedinternal.la
+                    ${PTHREAD_LIBS} \
+                    libmemcached/libmemcached.la \
+                    libmemcached/libmemcachedutil.la \
+                    libtest/libtest.la \
+                    libhashkit/libhashkit.la
 check_PROGRAMS+= tests/testapp
+noinst_PROGRAMS+= tests/testapp
 
 tests_testplus_SOURCES= tests/plus.cpp
 tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_testplus_DEPENDENCIES= $(TESTS_LDADDS)
 tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) $(LIBSASL)
 check_PROGRAMS+= tests/testplus
+noinst_PROGRAMS+= tests/testplus
 
 tests_atomsmasher_SOURCES= \
                           tests/atomsmasher.cc \
@@ -102,38 +107,56 @@ tests_atomsmasher_SOURCES= \
                           clients/execute.cc
 tests_atomsmasher_DEPENDENCIES= $(TESTS_LDADDS)
 tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) $(LIBSASL)
+noinst_PROGRAMS+= tests/atomsmasher
 
 tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
 tests_testudp_SOURCES= tests/mem_udp.cc
 tests_testudp_DEPENDENCIES= $(TESTS_LDADDS)
 tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL)
 check_PROGRAMS+= tests/testudp
+noinst_PROGRAMS+= tests/testudp
 
 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
 
 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_LDADDS)
+tests_hash_plus_DEPENDENCIES= $(tests_testhashkit_DEPENDENCIES)
 tests_hash_plus_LDADD= $(tests_testhashkit_DEPENDENCIES)
 check_PROGRAMS+= tests/hash_plus
+noinst_PROGRAMS+= tests/hash_plus
+
+tests_memcapable_SOURCES= tests/memcapable.cc
+tests_memcapable_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_memcapable_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
+tests_memcapable_LDADD=  $(tests_memcapable_DEPENDENCIES)
+check_PROGRAMS+= tests/memcapable
+noinst_PROGRAMS+= tests/memcapable
+
+tests_memslap_SOURCES= tests/memslap.cc
+tests_memslap_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_memslap_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS)
+tests_memslap_LDADD=  $(tests_memslap_DEPENDENCIES)
+check_PROGRAMS+= tests/memslap
+noinst_PROGRAMS+= tests/memslap
+# Test linking with C application
+tests_c_test_SOURCES= tests/c_test.c
+tests_c_test_LDADD= ${CLIENT_LDADD}
+check_PROGRAMS+=tests/c_test
+noinst_PROGRAMS+=tests/c_test
 
 test: check
 
-check-local: tests/var $(TEST_DOCS) memcapable
+check-local: tests/var $(TEST_DOCS)
        @echo "Tests completed"
 
 test-x: tests/var test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
        @echo "Tests completed"
 
-memcapable: clients/memcapable
-       @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
-       @clients/memcapable -p 12555 || echo "Your memcached server does not support all commands"
-       @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
-       @rm tests/Xumemc.pid
-
 test-memcat: clients/memcat clients/memcp
        @echo "Testing memcat"
        @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
@@ -259,6 +282,9 @@ test-hashplus: tests/var tests/hash_plus
 test-cycle: tests/var tests/cycle
        @tests/cycle
 
+test-memcapable: tests/var tests/memcapable
+       @tests/memcapable
+
 pahole-mem: tests/testapp
        @$(PAHOLE_COMMAND)  tests/testapp
 
@@ -283,9 +309,6 @@ gdb-hashplus: tests/hash_plus
 gdb-cycle: tests/cycle
        @$(DEBUG_COMMAND) tests/cycle
 
-gdb-memslap: clients/memslap
-       @$(DEBUG_COMMAND) clients/memslap
-
 valgrind-cycle: tests/cycle
        $(VALGRIND_COMMAND) tests/cycle
 
@@ -307,7 +330,7 @@ valgrind-hash: tests/testhashkit
 valgrind-hashplus: tests/hash_plus
        @$(VALGRIND_COMMAND) tests/hash_plus
 
-PHONY += valgrind
+.PHONY += valgrind
 valgrind: valgrind-cycle valgrind-mem valgrind-udp valgrind-plus valgrind-hash valgrind-hashplus
 
 helgrind-cycle: tests/cycle
@@ -334,14 +357,14 @@ helgrind-hashplus: tests/hash_plus
 .PHONY += helgrind
 helgrind: helgrind-cycle helgrind-mem helgrind-udp helgrind-plus helgrind-hash helgrind-hashplus
 
-PHONY += cachegrind
+.PHONY += cachegrind
 CLEANFILES += tests/cachegrind.out
 cachegrind:
        rm -f tests/cachegrind.out.*
        $(LIBTOOL) --mode=execute valgrind --tool=cachegrind --cachegrind-out-file=tests/cachegrind.out.%p --branch-sim=yes tests/testapp
        cg_annotate tests/cachegrind.out.* --auto=yes > tests/cachegrind.out
 
-PHONY += callgrind
+.PHONY += callgrind
 CLEANFILES += tests/callgrind.out
 callgrind:
        rm -f tests/callgrind.out.*