X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=6c263765bdb507bc329a6ed62261264fe895685b;hb=48171051f3c496c6bb2841a3abadbe9faa9cad07;hp=44954b110ffe35d200c7b2dd9b0699dc1b2f72e7;hpb=ae6bc7501efd5aeaaee92dabe2da0ec2d1625c5b;p=m6w6%2Flibmemcached diff --git a/tests/include.am b/tests/include.am index 44954b11..6c263765 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 - DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole @@ -29,11 +26,13 @@ EXTRA_DIST+= \ noinst_HEADERS+= \ tests/basic.h \ + tests/debug.h \ tests/error_conditions.h \ tests/hash_results.h \ tests/ketama_test_cases.h \ tests/ketama_test_cases_spy.h \ tests/libmemcached_world.h \ + tests/namespace.h \ tests/parser.h \ tests/deprecated.h \ tests/pool.h \ @@ -45,39 +44,49 @@ noinst_HEADERS+= \ noinst_PROGRAMS+= \ tests/atomsmasher \ + tests/cycle \ tests/hash_plus \ - tests/startservers \ 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_SOURCES= tests/cycle.cc +tests_cycle_DEPENDENCIES= $(TESTS_LDADDS) +tests_cycle_LDADD= $(tests_cycle_DEPENDENCIES) +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.c \ + 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) \ - clients/libgenexec.la \ libhashkit/libhashkit.la \ libmemcached/libmemcachedinternal.la tests_testapp_LDADD= \ $(LIBSASL) \ $(TESTS_LDADDS) \ - clients/libgenexec.la \ libhashkit/libhashkit.la \ libmemcached/libmemcachedinternal.la +check_PROGRAMS+= tests/testapp tests_testplus_SOURCES= tests/plus.cpp tests_testplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX) @@ -85,41 +94,36 @@ tests_testplus_DEPENDENCIES= $(TESTS_LDADDS) tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) $(LIBSASL) check_PROGRAMS+= tests/testplus -tests_atomsmasher_SOURCES= tests/atomsmasher.c -tests_atomsmasher_DEPENDENCIES= \ - clients/libgenexec.la \ - $(TESTS_LDADDS) - +tests_atomsmasher_SOURCES= \ + tests/atomsmasher.cc \ + clients/generator.cc \ + clients/execute.cc +tests_atomsmasher_DEPENDENCIES= $(TESTS_LDADDS) tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) $(LIBSASL) tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) -tests_testudp_SOURCES= tests/mem_udp.c -tests_testudp_DEPENDENCIES= \ - clients/libgenexec.la \ - $(TESTS_LDADDS) - +tests_testudp_SOURCES= tests/mem_udp.cc +tests_testudp_DEPENDENCIES= $(TESTS_LDADDS) tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL) +check_PROGRAMS+= tests/testudp -tests_startservers_SOURCES= tests/start.c -tests_startservers_DEPENDENCIES= $(TESTS_LDADDS) -tests_startservers_LDADD= $(tests_startservers_DEPENDENCIES) $(LIBSASL) - -tests_testhashkit_SOURCES = tests/hashkit_functions.c -tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la +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 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 test: check -check-local: tests/var $(TEST_DOCS) test-mem test-hash memcapable +check-local: tests/var $(TEST_DOCS) memcapable @echo "Tests completed" -test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat +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 @@ -236,38 +240,43 @@ valgrind-memerror: clients/memerror -MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE) +MEMSLAP_COMMAND= clients/memslap + +MEM_COMMAND= tests/testapp -MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE) +TESTPLUS_COMMAND= tests/testplus -TESTPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE) +HASHPLUS_COMMAND= tests/hashplus -HASHPLUS_COMMAND= tests/hashplus $(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/testapp +test-mem: tests/var tests/testapp $(MEM_COMMAND) -test-udp: tests/testudp +test-udp: tests/var tests/testudp $(UDP_COMMAND) -test-atom: tests/atomsmasher +test-atom: tests/var tests/atomsmasher $(ATOM_COMMAND) -test-plus: tests/testplus +test-plus: tests/var tests/testplus $(TESTPLUS_COMMAND) -test-hash: tests/testhashkit +test-hash: tests/var tests/testhashkit $(HASH_COMMAND) -test-hashplus: tests/hashplus +test-hashplus: tests/var tests/hashplus $(HASHPLUS_COMMAND) +test-cycle: tests/var tests/cycle + $(CYCLE_COMMAND) + pahole-mem: tests/testapp $(PAHOLE_COMMAND) $(MEM_COMMAND) @@ -289,9 +298,15 @@ gdb-hash: tests/testhashkit gdb-hashplus: tests/hashplus $(DEBUG_COMMAND) $(HASHPLUS_COMMAND) +gdb-cycle: tests/cycle + $(DEBUG_COMMAND) $(CYCLE_COMMAND) + gdb-memslap: clients/memslap $(DEBUG_COMMAND) $(MEMSLAP_COMMAND) +valgrind-cycle: tests/cycle + $(VALGRIND_COMMAND) $(CYCLE_COMMAND) + valgrind-mem: tests/testapp $(VALGRIND_COMMAND) $(MEM_COMMAND) @@ -314,7 +329,34 @@ 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-mem valgrind-hash valgrind-memcat valgrind-memcp valgrind-memrm valgrind-memerror valgrind-memdump valgrind-memflush valgrind-memstat + +helgrind-cycle: tests/cycle + $(HELGRIND_COMMAND) $(CYCLE_COMMAND) + +helgrind-mem: tests/testapp + $(HELGRIND_COMMAND) $(MEM_COMMAND) + +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) + +helgrind-memslap: clients/memslap + $(HELGRIND_COMMAND) $(MEMSLAP_COMMAND) + +PHONY += helgrind +helgrind: helgrind-mem helgrind-hash helgrind-memcat helgrind-memcp helgrind-memrm helgrind-memerror helgrind-memdump helgrind-memflush helgrind-memstat PHONY += cachegrind CLEANFILES += tests/cachegrind.out