X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=ac0dd92b828cdd58d8f8b6cc0f0f9a2769c727de;hb=04b8554c3724eae57fbd75dc6b3e69dca8b58187;hp=6ed1cd9f07bd3db2d5ee1d9d7998ac48f3817df8;hpb=fec19fea6ca5b041458a5eb415e2ada343fcae55;p=awesomized%2Flibmemcached diff --git a/tests/include.am b/tests/include.am index 6ed1cd9f..ac0dd92b 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 @@ -28,84 +25,105 @@ EXTRA_DIST+= \ tests/output_plus.res 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/print.h + tests/deprecated.h \ + tests/pool.h \ + tests/print.h \ + tests/replication.h \ + tests/string.h \ + tests/virtual_buckets.h + noinst_PROGRAMS+= \ tests/atomsmasher \ - tests/hashplus \ - tests/memplus \ - tests/startservers \ + 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_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/mem_functions.c \ + tests/basic.cc \ + tests/debug.cc \ + tests/deprecated.cc \ + tests/error_conditions.cc \ + tests/mem_functions.cc \ + tests/namespace.cc \ tests/parser.cc \ + tests/pool.cc \ tests/print.cc \ - tests/replication.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) \ - clients/libgenexec.la \ - libmemcached/libmemcachedinternal.la \ - $(TESTS_LDADDS) + $(TESTS_LDADDS) \ + libhashkit/libhashkit.la \ + libmemcached/libmemcachedinternal.la -tests_testapp_LDADD= clients/libgenexec.la \ - libmemcached/libmemcachedinternal.la \ - $(TESTS_LDADDS) $(LIBSASL) +tests_testapp_LDADD= \ + $(LIBSASL) \ + $(TESTS_LDADDS) \ + libhashkit/libhashkit.la \ + libmemcached/libmemcachedinternal.la +check_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 -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_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL) - -tests_hashplus_SOURCES = tests/hash_plus.cc -tests_hashplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_hashplus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES) -tests_hashplus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL) +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_memplus_SOURCES = tests/mem_plus.cc -tests_memplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memplus_DEPENDENCIES = $(TESTS_LDADDS) -tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES) $(LIBSASL) +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_LDADD= $(tests_testhashkit_DEPENDENCIES) +check_PROGRAMS+= tests/hash_plus test: check -check-local: $(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 @@ -222,48 +240,48 @@ 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 -MEMPLUS_COMMAND= tests/memplus $(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 - $(MEM_COMMAND) +test-mem: tests/var tests/testapp + @tests/testapp -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-memplus: tests/memplus - $(MEMPLUS_COMMAND) +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) @@ -280,14 +298,17 @@ gdb-hash: tests/testhashkit gdb-hashplus: tests/hashplus $(DEBUG_COMMAND) $(HASHPLUS_COMMAND) -gdb-memplus: tests/memplus - $(DEBUG_COMMAND) $(MEMPLUS_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) + @$(VALGRIND_COMMAND) tests/testapp valgrind-atom: tests/atomsmasher $(VALGRIND_COMMAND) $(ATOM_COMMAND) @@ -304,14 +325,32 @@ valgrind-hash: tests/testhashkit valgrind-hashplus: tests/hashplus $(VALGRIND_COMMAND) $(HASHPLUS_COMMAND) -valgrind-memplus: tests/memplus - $(VALGRIND_COMMAND) $(MEMPLUS_COMMAND) +PHONY += valgrind +valgrind: valgrind-cycle valgrind-mem valgrind-atom valgrind-udp valgrind-plus valgrind-hash valgrind-hashplus -valgrind-memslap: clients/memslap - $(VALGRIND_COMMAND) $(MEMSLAP_COMMAND) +helgrind-cycle: tests/cycle + $(HELGRIND_COMMAND) $(CYCLE_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 +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 @@ -327,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