X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=b8e9e17f52f10e89cab1d8f927e2f5609342212a;hb=19d7df5119c3f07370f58857f4d916cd5de398ea;hp=5afdf5bfae7401a0bf50d1a2c089cce832135cc3;hpb=dbd192a1c0caf4eb95c433d21d124c359c00381d;p=m6w6%2Flibmemcached diff --git a/tests/include.am b/tests/include.am index 5afdf5bf..b8e9e17f 100644 --- a/tests/include.am +++ b/tests/include.am @@ -8,23 +8,25 @@ # 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 +TESTS_LDADDS= +TESTS_LDADDS+= libmemcached/libmemcached.la +TESTS_LDADDS+= libmemcached/libmemcachedutil.la +TESTS_LDADDS+= 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 +EXTRA_DIST+= tests/cpp_example.cc -noinst_HEADERS+= \ - tests/exist.h \ - tests/hash_results.h \ - tests/libmemcached_world.h +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.h +noinst_HEADERS+= tests/runner.h # Cycle should always run first tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) @@ -39,19 +41,40 @@ 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) 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 + @$(DEBUG_COMMAND) 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) 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) @@ -59,178 +82,36 @@ tests_hash_plus_LDADD= $(tests_testhashkit_DEPENDENCIES) check_PROGRAMS+= tests/hash_plus noinst_PROGRAMS+= tests/hash_plus -tests_memcapable_SOURCES= tests/memcapable.cc -tests_memcapable_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memcapable_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcapable -tests_memcapable_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memcapable -noinst_PROGRAMS+= tests/memcapable - -tests_memstat_SOURCES= tests/memstat.cc -tests_memstat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memstat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memstat -tests_memstat_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memstat -noinst_PROGRAMS+= tests/memstat - -tests_memcp_SOURCES= tests/memcp.cc -tests_memcp_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memcp_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcp -tests_memcp_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memcp -noinst_PROGRAMS+= tests/memcp - -tests_memflush_SOURCES= tests/memflush.cc -tests_memflush_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memflush_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memflush -tests_memflush_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memflush -noinst_PROGRAMS+= tests/memflush - -tests_memrm_SOURCES= tests/memrm.cc -tests_memrm_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memrm_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memrm -tests_memrm_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memrm -noinst_PROGRAMS+= tests/memrm - -tests_memexist_SOURCES= tests/memexist.cc -tests_memexist_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memexist_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memexist -tests_memexist_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memexist -noinst_PROGRAMS+= tests/memexist - -tests_memtouch_SOURCES= tests/memtouch.cc -tests_memtouch_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memtouch_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memtouch -tests_memtouch_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memtouch -noinst_PROGRAMS+= tests/memtouch - -tests_memcat_SOURCES= tests/memcat.cc -tests_memcat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memcat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memcat -tests_memcat_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memcat -noinst_PROGRAMS+= tests/memcat - -tests_memerror_SOURCES= tests/memerror.cc -tests_memerror_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memerror_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memerror -tests_memerror_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memerror -noinst_PROGRAMS+= tests/memerror - -tests_memslap_SOURCES= tests/memslap.cc -tests_memslap_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memslap_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memslap -tests_memslap_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memslap -noinst_PROGRAMS+= tests/memslap - -tests_memdump_SOURCES= tests/memdump.cc -tests_memdump_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) -tests_memdump_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) clients/memdump -tests_memdump_LDADD= libtest/libtest.la $(TESTS_LDADDS) -check_PROGRAMS+= tests/memdump -noinst_PROGRAMS+= tests/memdump +include tests/cli.am test: check check-local: $(TEST_DOCS) @echo "Tests completed" -test-x: test-plus test-memcp test-memdump test-memflush test-memstat - @echo "Tests completed" - -test-memcp: clients/memcp - @echo "Testing memcp" - @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat - @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" - @rm tests/Xumemc.pid - -valgrind-memcp: clients/memcat clients/memcp - @echo "Testing memcp" - @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @$(VALGRIND_COMMAND) clients/memcp --servers="localhost:12555" clients/memcp clients/memcat clients/memstat - @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" - @rm tests/Xumemc.pid - -test-memflush: clients/memflush - @echo "Testing memflush" - @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @clients/memflush --servers="localhost:12555" - @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" - @rm tests/Xumemc.pid - -valgrind-memflush: clients/memflush - @echo "Testing memflush" - @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @$(VALGRIND_COMMAND) clients/memflush --servers="localhost:12555" - @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" - @rm tests/Xumemc.pid - -test-memdump: clients/memdump clients/memcp - @echo "Testing memdump" - @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @clients/memcp --servers="localhost:12555" clients/memcat - @clients/memdump --servers="localhost:12555" > /dev/null - @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" - @rm tests/Xumemc.pid - -valgrind-memdump: clients/memcat clients/memcp - @echo "Testing memdump" - @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @clients/memcp --servers="localhost:12555" clients/memcat - @$(VALGRIND_COMMAND) clients/memdump --servers="localhost:12555" > /dev/null - @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" - @rm tests/Xumemc.pid - -test-memstat: clients/memstat - @echo "Testing memstat" - @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @clients/memstat --servers="localhost:12555" > /dev/null - @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" - @rm tests/Xumemc.pid - -valgrind-memstat: clients/memstat - @echo "Testing memstat" - @$(MEMC_BINARY) -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @$(VALGRIND_COMMAND) clients/memstat --servers="localhost:12555" > /dev/null - @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" - @rm tests/Xumemc.pid - -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 pahole-mem: tests/testapp @$(PAHOLE_COMMAND) tests/testapp -gdb-mem: tests/testapp - @$(DEBUG_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 @@ -238,9 +119,6 @@ gdb-sasl: tests/sasl gdb-atom: tests/atomsmasher @$(DEBUG_COMMAND) tests/atomsmasher -gdb-plus: tests/testplus - $(DEBUG_COMMAND) tests/testplus - gdb-hash: tests/testhashkit @$(DEBUG_COMMAND) tests/testhashkit @@ -250,14 +128,11 @@ gdb-hashplus: tests/hash_plus gdb-cycle: tests/cycle @$(DEBUG_COMMAND) tests/cycle -gdb-failure: tests/failure - @$(DEBUG_COMMAND) tests/failure - 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 @@ -265,9 +140,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 @@ -280,15 +152,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