X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=0ac1d8984f3b49172d95919b61a5b800c64cf2d8;hb=76bf27c007d5015d3dcf2981c942d8afb2e97302;hp=56e7181674f3a7c7c9dc824b5aa355edb440aafe;hpb=65e75d2db2d217b37c94c36d48607cb8425c8f86;p=awesomized%2Flibmemcached diff --git a/tests/include.am b/tests/include.am index 56e71816..0ac1d898 100644 --- a/tests/include.am +++ b/tests/include.am @@ -8,55 +8,69 @@ # included from Top Level Makefile.am # All paths should be given relative to the root -TESTS_LDADDS= \ - libmemcached/libmemcached.la \ - libmemcached/libmemcachedutil.la \ - libtest/libtest.la - -DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb - -PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole - -EXTRA_DIST+= \ - tests/cpp_example.cc \ - tests/output_plus.res - -noinst_HEADERS+= \ - tests/exist.h \ - tests/hash_results.h \ - tests/libmemcached_world.h \ - tests/libmemcached_world_socket.h +TESTS_LDADDS= +TESTS_LDADDS+= libmemcached/libmemcached.la +TESTS_LDADDS+= libmemcached/libmemcachedutil.la +TESTS_LDADDS+= libtest/libtest.la + +EXTRA_DIST+= tests/cpp_example.cc + +noinst_HEADERS+= tests/exist.h +noinst_HEADERS+= tests/hash_results.h +noinst_HEADERS+= tests/keys.hpp +noinst_HEADERS+= tests/libmemcached_test_container.h +noinst_HEADERS+= tests/libmemcached_world.h +noinst_HEADERS+= tests/libmemcached_world_socket.h +noinst_HEADERS+= tests/memc.hpp +noinst_HEADERS+= tests/runner.h # Cycle should always run first tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) tests_cycle_CXXFLAGS= $(AM_CXXFLAGS) tests_cycle_CXXFLAGS+= ${PTHREAD_CFLAGS} tests_cycle_SOURCES= tests/cycle.cc -tests_cycle_DEPENDENCIES= $(TESTS_LDADDS) -tests_cycle_LDADD= $(tests_cycle_DEPENDENCIES) +tests_cycle_LDADD= $(TESTS_LDADDS) tests_cycle_LDADD+= ${PTHREAD_LIBS} check_PROGRAMS+= tests/cycle noinst_PROGRAMS+= tests/cycle include tests/libmemcached-1.0/include.am -tests_failure_SOURCES= tests/failure.cc +include tests/parser.am + +tests_failure_SOURCES= +tests_failure_SOURCES+= tests/failure.cc +tests_failure_SOURCES+= clients/execute.cc +tests_failure_SOURCES+= clients/generator.cc +tests_failure_SOURCES+= tests/libmemcached-1.0/callback_counter.cc +tests_failure_SOURCES+= tests/libmemcached-1.0/fetch_all_results.cc +tests_failure_SOURCES+= tests/libmemcached-1.0/generate.cc +tests_failure_SOURCES+= tests/libmemcached-1.0/print.cc + tests_failure_CXXFLAGS = $(AM_CXXFLAGS) -tests_failure_DEPENDENCIES= $(TESTS_LDADDS) -tests_failure_LDADD= $(tests_failure_DEPENDENCIES) +tests_failure_LDADD= $(TESTS_LDADDS) check_PROGRAMS+= tests/failure noinst_PROGRAMS+= tests/failure -tests_testhashkit_SOURCES = tests/hashkit_functions.cc -tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS) -tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) +test-failure: tests/failure + @tests/failure + +gdb-failure: tests/failure + @$(GDB_COMMAND) tests/failure + + +tests_testhashkit_SOURCES= tests/hashkit_functions.cc +tests_testhashkit_LDADD= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS) check_PROGRAMS+= tests/testhashkit noinst_PROGRAMS+= tests/testhashkit +test-hash: tests/testhashkit + @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_LDADD= $(tests_testhashkit_DEPENDENCIES) +tests_hash_plus_LDADD= $(tests_testhashkit_LDADD) check_PROGRAMS+= tests/hash_plus noinst_PROGRAMS+= tests/hash_plus @@ -64,65 +78,47 @@ include tests/cli.am test: check -check-local: $(TEST_DOCS) - @echo "Tests completed" - -test-mem: tests/var tests/libmemcached-1.0/testapp +test-mem: tests/libmemcached-1.0/testapp @tests/libmemcached-1.0/testapp -test-sasl: tests/sasl - @tests/sasl - -test-atom: tests/var tests/atomsmasher +test-atom: tests/atomsmasher @tests/atomsmasher -test-plus: tests/var tests/testplus - @tests/testplus - -test-hash: tests/var tests/testhashkit - @tests/testhashkit - -test-hashplus: tests/var tests/hash_plus +test-hashplus: tests/hash_plus @tests/hash_plus -test-cycle: tests/var tests/cycle +test-cycle: tests/cycle @tests/cycle -test-memcapable: tests/var tests/memcapable +test-memcapable: tests/memcapable @tests/memcapable +valgrind-memcapable: tests/memcapable + $(VALGRIND_COMMAND) tests/memcapable + pahole-mem: tests/testapp @$(PAHOLE_COMMAND) tests/testapp gdb-mem: tests/libmemcached-1.0/testapp - @$(DEBUG_COMMAND) tests/libmemcached-1.0/testapp - -gdb-sasl: tests/sasl - @$(DEBUG_COMMAND) tests/sasl + @$(GDB_COMMAND) tests/libmemcached-1.0/testapp gdb-atom: tests/atomsmasher - @$(DEBUG_COMMAND) tests/atomsmasher - -gdb-plus: tests/testplus - $(DEBUG_COMMAND) tests/testplus + @$(GDB_COMMAND) tests/atomsmasher gdb-hash: tests/testhashkit - @$(DEBUG_COMMAND) tests/testhashkit + @$(GDB_COMMAND) tests/testhashkit gdb-hashplus: tests/hash_plus - @$(DEBUG_COMMAND) tests/hash_plus + @$(GDB_COMMAND) tests/hash_plus gdb-cycle: tests/cycle - @$(DEBUG_COMMAND) tests/cycle - -gdb-failure: tests/failure - @$(DEBUG_COMMAND) tests/failure + @$(GDB_COMMAND) tests/cycle valgrind-cycle: tests/cycle $(VALGRIND_COMMAND) tests/cycle -valgrind-mem: tests/testapp - @$(VALGRIND_COMMAND) tests/testapp +valgrind-mem: tests/libmemcached-1.0/testapp + @$(VALGRIND_COMMAND) tests/libmemcached-1.0/testapp valgrind-failure: tests/failure @$(VALGRIND_COMMAND) tests/failure @@ -130,9 +126,6 @@ valgrind-failure: tests/failure valgrind-atom: tests/atomsmasher $(VALGRIND_COMMAND) tests/atomsmasher -valgrind-plus: tests/testplus - @$(VALGRIND_COMMAND) tests/testplus - valgrind-sasl: tests/sasl @$(VALGRIND_COMMAND) tests/sasl @@ -145,15 +138,12 @@ valgrind-hashplus: tests/hash_plus helgrind-cycle: tests/cycle @$(HELGRIND_COMMAND) tests/cycle -helgrind-mem: tests/testapp - @$(HELGRIND_COMMAND) tests/testapp +helgrind-mem: tests/libmemcached-1.0/testapp + @$(HELGRIND_COMMAND) tests/libmemcached-1.0/testapp helgrind-atom: tests/atomsmasher @$(HELGRIND_COMMAND) tests/atomsmasher -helgrind-plus: tests/testplus - @$(HELGRIND_COMMAND) tests/testplus - helgrind-hash: tests/testhashkit @$(HELGRIND_COMMAND) tests/testhashkit