X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=93f26bed0dc697c9604398bf2b83db3c973fbde6;hb=c5c5f2799a24eac8df5e11f447b48e031299579a;hp=e254670979273aba36d3c3434b43f3de2aadb775;hpb=7abcaebdc4c3dd11b779eaef58a7371fb82ae888;p=m6w6%2Flibmemcached diff --git a/tests/include.am b/tests/include.am index e2546709..93f26bed 100644 --- 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 \ @@ -97,6 +96,8 @@ check_PROGRAMS+= tests/testplus tests_atomsmasher_SOURCES= \ tests/atomsmasher.cc \ + tests/debug.cc \ + tests/print.cc \ clients/generator.cc \ clients/execute.cc tests_atomsmasher_DEPENDENCIES= $(TESTS_LDADDS) @@ -109,13 +110,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 @@ -237,97 +238,101 @@ valgrind-memerror: clients/memerror @echo "Testing memerror" @$(VALGRIND_COMMAND) clients/memerror 0 > /dev/null - - - - -MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE) - -MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE) - -TESTPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE) - -HASHPLUS_COMMAND= tests/hashplus $(COLLECTION) $(SUITE) - -CYCLE_COMMAND= tests/cycle $(COLLECTION) $(SUITE) - -ATOM_COMMAND= tests/atomsmasher $(COLLECTION) $(SUITE) - -UDP_COMMAND= tests/testudp $(COLLECTION) $(SUITE) - -HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE) - test-mem: tests/var tests/testapp - $(MEM_COMMAND) + @tests/testapp test-udp: tests/var tests/testudp - $(UDP_COMMAND) + @tests/testudp test-atom: tests/var tests/atomsmasher - $(ATOM_COMMAND) + @tests/atomsmasher test-plus: tests/var tests/testplus - $(TESTPLUS_COMMAND) + @tests/testplus test-hash: tests/var tests/testhashkit - $(HASH_COMMAND) + @tests/testhashkit -test-hashplus: tests/var tests/hashplus - $(HASHPLUS_COMMAND) +test-hashplus: tests/var tests/hash_plus + @tests/hash_plus test-cycle: tests/var tests/cycle - $(CYCLE_COMMAND) + @tests/cycle 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) + @$(DEBUG_COMMAND) tests/testudp gdb-udp: tests/testudp - $(DEBUG_COMMAND) $(ATOM_COMMAND) + @$(DEBUG_COMMAND) tests/atomsmasher gdb-plus: tests/testplus - $(DEBUG_COMMAND) $(TESTPLUS_COMMAND) + $(DEBUG_COMMAND) tests/testplus gdb-hash: tests/testhashkit - $(DEBUG_COMMAND) $(HASH_COMMAND) + @$(DEBUG_COMMAND) tests/testhashkit -gdb-hashplus: tests/hashplus - $(DEBUG_COMMAND) $(HASHPLUS_COMMAND) +gdb-hashplus: tests/hash_plus + @$(DEBUG_COMMAND) tests/hash_plus gdb-cycle: tests/cycle - $(DEBUG_COMMAND) $(CYCLE_COMMAND) + @$(DEBUG_COMMAND) tests/cycle gdb-memslap: clients/memslap - $(DEBUG_COMMAND) $(MEMSLAP_COMMAND) + @$(DEBUG_COMMAND) clients/memslap + +valgrind-cycle: tests/cycle + $(VALGRIND_COMMAND) tests/cycle valgrind-mem: tests/testapp - $(VALGRIND_COMMAND) $(MEM_COMMAND) + @$(VALGRIND_COMMAND) tests/testapp valgrind-atom: tests/atomsmasher - $(VALGRIND_COMMAND) $(ATOM_COMMAND) + $(VALGRIND_COMMAND) tests/atomsmasher valgrind-udp: tests/testudp - $(VALGRIND_COMMAND) $(UDP_COMMAND) + $(VALGRIND_COMMAND) tests/testudp valgrind-plus: tests/testplus - $(VALGRIND_COMMAND) $(TESTPLUS_COMMAND) + @$(VALGRIND_COMMAND) tests/testplus valgrind-hash: tests/testhashkit - $(VALGRIND_COMMAND) $(HASH_COMMAND) - -valgrind-hashplus: tests/hashplus - $(VALGRIND_COMMAND) $(HASHPLUS_COMMAND) + @$(VALGRIND_COMMAND) tests/testhashkit -valgrind-memslap: clients/memslap - $(VALGRIND_COMMAND) $(MEMSLAP_COMMAND) +valgrind-hashplus: tests/hash_plus + @$(VALGRIND_COMMAND) tests/hash_plus 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-udp valgrind-plus valgrind-hash valgrind-hashplus + +helgrind-cycle: tests/cycle + @$(HELGRIND_COMMAND) tests/cycle + +helgrind-mem: tests/testapp + @$(HELGRIND_COMMAND) tests/testapp + +helgrind-atom: tests/atomsmasher + @$(HELGRIND_COMMAND) tests/atomsmasher + +helgrind-udp: tests/testudp + @$(HELGRIND_COMMAND) tests/testudp + +helgrind-plus: tests/testplus + @$(HELGRIND_COMMAND) tests/testplus + +helgrind-hash: tests/testhashkit + @$(HELGRIND_COMMAND) tests/testhashkit + +helgrind-hashplus: tests/hash_plus + @$(HELGRIND_COMMAND) tests/hash_plus + +.PHONY += helgrind +helgrind: helgrind-cycle helgrind-mem helgrind-udp helgrind-plus helgrind-hash helgrind-hashplus PHONY += cachegrind CLEANFILES += tests/cachegrind.out @@ -343,17 +348,7 @@ 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 - $(VALGRIND_COMMAND) --log-file=tests/valgrind.out $(MEM_COMMAND) + $(VALGRIND_COMMAND) --log-file=tests/valgrind.out tests/testapp