Merge in trunk

[awesomized/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index e254670979273aba36d3c3434b43f3de2aadb775..ac0dd92b828cdd58d8f8b6cc0f0f9a2769c727de 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -10,11 +10,8 @@
 
 TESTS_LDADDS= \
              libmemcached/libmemcached.la \
-             libtest/libserver.la \
              libtest/libtest.la
 
-VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE
-
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
 PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
@@ -29,6 +26,7 @@ EXTRA_DIST+= \
 
 noinst_HEADERS+= \
                 tests/basic.h \
+                tests/debug.h \
                 tests/error_conditions.h \
                 tests/hash_results.h \
                 tests/ketama_test_cases.h \
@@ -64,6 +62,7 @@ check_PROGRAMS+= tests/cycle
 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/mem_functions.cc \
@@ -109,13 +108,13 @@ tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL)
 check_PROGRAMS+= tests/testudp
 
 tests_testhashkit_SOURCES = tests/hashkit_functions.cc
-tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la
+tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
 tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES)
 check_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_hash_plus_DEPENDENCIES= $(tests_testhashkit_DEPENDENCIES) $(TESTS_LDADDS)
 tests_hash_plus_LDADD= $(tests_testhashkit_DEPENDENCIES)
 check_PROGRAMS+= tests/hash_plus
 
@@ -241,24 +240,24 @@ valgrind-memerror: clients/memerror
 
 
 
-MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE)
+MEMSLAP_COMMAND= clients/memslap
 
-MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
+MEM_COMMAND= tests/testapp
 
-TESTPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
+TESTPLUS_COMMAND= tests/testplus
 
-HASHPLUS_COMMAND= tests/hashplus $(COLLECTION) $(SUITE)
+HASHPLUS_COMMAND= tests/hashplus
 
-CYCLE_COMMAND= tests/cycle $(COLLECTION) $(SUITE)
+CYCLE_COMMAND= tests/cycle
 
-ATOM_COMMAND= tests/atomsmasher $(COLLECTION) $(SUITE)
+ATOM_COMMAND= tests/atomsmasher
 
-UDP_COMMAND= tests/testudp $(COLLECTION) $(SUITE)
+UDP_COMMAND= tests/testudp
 
-HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
+HASH_COMMAND= tests/testhashkit
 
 test-mem: tests/var tests/testapp
-       $(MEM_COMMAND)
+       @tests/testapp
 
 test-udp: tests/var tests/testudp
        $(UDP_COMMAND)
@@ -279,10 +278,10 @@ test-cycle: tests/var tests/cycle
        $(CYCLE_COMMAND)
 
 pahole-mem: tests/testapp
-       $(PAHOLE_COMMAND)  $(MEM_COMMAND)
+       @$(PAHOLE_COMMAND)  tests/testapp
 
 gdb-mem: tests/testapp
-       $(DEBUG_COMMAND)  $(MEM_COMMAND)
+       @$(DEBUG_COMMAND)  tests/testapp
 
 gdb-atom: tests/atomsmasher
        $(DEBUG_COMMAND)  $(UDP_COMMAND)
@@ -305,8 +304,11 @@ gdb-cycle: tests/cycle
 gdb-memslap: clients/memslap
        $(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
 
+valgrind-cycle: tests/cycle
+       $(VALGRIND_COMMAND)  $(CYCLE_COMMAND)
+
 valgrind-mem: tests/testapp
-       $(VALGRIND_COMMAND)  $(MEM_COMMAND)
+       @$(VALGRIND_COMMAND) tests/testapp
 
 valgrind-atom: tests/atomsmasher
        $(VALGRIND_COMMAND)  $(ATOM_COMMAND)
@@ -323,11 +325,32 @@ valgrind-hash: tests/testhashkit
 valgrind-hashplus: tests/hashplus
        $(VALGRIND_COMMAND) $(HASHPLUS_COMMAND)
 
-valgrind-memslap: clients/memslap
-       $(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)
-
 PHONY += valgrind
-valgrind: tests/testapp tests/testhashkit valgrind-mem valgrind-hash valgrind-memcat valgrind-memcp valgrind-memrm valgrind-memerror valgrind-memdump valgrind-memflush valgrind-memstat
+valgrind: valgrind-cycle valgrind-mem valgrind-atom valgrind-udp valgrind-plus valgrind-hash valgrind-hashplus
+
+helgrind-cycle: tests/cycle
+       $(HELGRIND_COMMAND)  $(CYCLE_COMMAND)
+
+helgrind-mem: tests/testapp
+       @$(HELGRIND_COMMAND) tests/testapp
+
+helgrind-atom: tests/atomsmasher
+       $(HELGRIND_COMMAND)  $(ATOM_COMMAND)
+
+helgrind-udp: tests/testudp
+       $(HELGRIND_COMMAND)  $(UDP_COMMAND)
+
+helgrind-plus: tests/testplus
+       $(HELGRIND_COMMAND)  $(TESTPLUS_COMMAND)
+
+helgrind-hash: tests/testhashkit
+       $(HELGRIND_COMMAND) $(HASH_COMMAND)
+
+helgrind-hashplus: tests/hashplus
+       $(HELGRIND_COMMAND) $(HASHPLUS_COMMAND)
+
+.PHONY += helgrind
+helgrind: helgrind-cycle helgrind-mem helgrind-atom helgrind-udp helgrind-plus helgrind-hash helgrind-hashplus
 
 PHONY += cachegrind
 CLEANFILES += tests/cachegrind.out
@@ -343,16 +366,6 @@ callgrind:
        $(LIBTOOL) --mode=execute valgrind --tool=callgrind --callgrind-out-file=tests/callgrind.out.%p  tests/testapp
        callgrind_annotate tests/callgrind.out.* --auto=yes > tests/callgrind.out
 
-PHONY += helgrind
-CLEANFILES+= helgrind.out.*
-helgrind:
-       rm -f helgrind.out.*
-       $(LIBTOOL) --mode=execute valgrind --tool=helgrind  tests/testapp
-
-PHONY += helgrind-slap
-helgrind-slap:
-       $(LIBTOOL) --mode=execute valgrind --tool=helgrind  clients/memslap --server=localhost --concurrency=30
-
 test-no-outputdiff: test
 
 hudson-valgrind: tests/testapp