X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=2bbe5802a0fcba4f779835edc2ced1b4df16a2d6;hb=77e79fb2056c9a177a670da48178fd1ac051d33d;hp=954f32b20e394d5cbc5beaf441de403f443239e2;hpb=91e92172731fe8a37e562a165d25a312569aff44;p=m6w6%2Flibmemcached diff --git a/tests/include.am b/tests/include.am index 954f32b2..2bbe5802 100644 --- a/tests/include.am +++ b/tests/include.am @@ -10,16 +10,13 @@ TESTS_LDADDS= \ libmemcached/libmemcached.la \ + libmemcached/libmemcachedutil.la \ libtest/libtest.la DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole -if BUILD_LIBMEMCACHEDUTIL -TESTS_LDADDS+= libmemcached/libmemcachedutil.la -endif - EXTRA_DIST+= \ tests/cpp_example.cc \ tests/output_plus.res @@ -29,6 +26,7 @@ noinst_HEADERS+= \ tests/debug.h \ tests/error_conditions.h \ tests/hash_results.h \ + tests/ketama.h \ tests/ketama_test_cases.h \ tests/ketama_test_cases_spy.h \ tests/libmemcached_world.h \ @@ -38,55 +36,107 @@ noinst_HEADERS+= \ tests/pool.h \ tests/print.h \ tests/replication.h \ + tests/server_add.h \ tests/string.h \ tests/virtual_buckets.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+= ${PTHREAD_LIBS} check_PROGRAMS+= tests/cycle noinst_PROGRAMS+= tests/cycle +# Test internals +tests_internals_SOURCES= tests/internals.cc +tests_internals_SOURCES+= tests/string.cc +tests_internals_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS} +tests_internals_DEPENDENCIES= libmemcachedinternal/libmemcachedinternal.la libtest/libtest.la libmemcachedinternal/libmemcachedutilinternal.la +tests_internals_LDADD= libmemcachedinternal/libmemcachedinternal.la +tests_internals_LDADD+= ${PTHREAD_LIBS} +tests_internals_LDADD+= libmemcachedinternal/libmemcachedutilinternal.la +tests_internals_LDADD+= libtest/libtest.la +check_PROGRAMS+= tests/internals +noinst_PROGRAMS+= tests/internals + +tests_testapp_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS} 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/ketama.cc \ tests/mem_functions.cc \ tests/namespace.cc \ tests/parser.cc \ tests/pool.cc \ tests/print.cc \ tests/replication.cc \ - tests/string.cc \ + tests/server_add.cc \ tests/virtual_buckets.cc tests_testapp_SOURCES+= clients/generator.cc clients/execute.cc - tests_testapp_DEPENDENCIES= \ - $(BUILT_SOURCES) \ - $(TESTS_LDADDS) \ + libmemcached/libmemcached.la \ + libtest/libtest.la libhashkit/libhashkit.la \ - libmemcached/libmemcachedinternal.la - + libmemcached/libmemcachedutil.la tests_testapp_LDADD= \ - $(LIBSASL) \ - $(TESTS_LDADDS) \ - libhashkit/libhashkit.la \ - libmemcached/libmemcachedinternal.la + ${PTHREAD_LIBS} \ + libmemcached/libmemcached.la \ + libmemcached/libmemcachedutil.la \ + libtest/libtest.la \ + libhashkit/libhashkit.la check_PROGRAMS+= tests/testapp noinst_PROGRAMS+= tests/testapp +tests_sasl_CXXFLAGS = $(AM_CXXFLAGS) ${PTHREAD_CFLAGS} +tests_sasl_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) +tests_sasl_SOURCES= \ + tests/basic.cc \ + tests/debug.cc \ + tests/deprecated.cc \ + tests/error_conditions.cc \ + tests/ketama.cc \ + tests/sasl.cc \ + tests/namespace.cc \ + tests/parser.cc \ + tests/pool.cc \ + tests/print.cc \ + tests/replication.cc \ + tests/virtual_buckets.cc +tests_sasl_SOURCES+= clients/generator.cc clients/execute.cc +tests_sasl_DEPENDENCIES= \ + libmemcached/libmemcached.la \ + libtest/libtest.la +tests_sasl_LDADD= \ + ${PTHREAD_LIBS} \ + libmemcached/libmemcached.la \ + libmemcached/libmemcachedutil.la \ + libtest/libtest.la \ + libhashkit/libhashkit.la +check_PROGRAMS+= tests/sasl +noinst_PROGRAMS+= tests/sasl + 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) +tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) check_PROGRAMS+= tests/testplus noinst_PROGRAMS+= tests/testplus +tests_failure_SOURCES= tests/failure.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_atomsmasher_SOURCES= \ tests/atomsmasher.cc \ tests/debug.cc \ @@ -94,13 +144,13 @@ tests_atomsmasher_SOURCES= \ clients/generator.cc \ clients/execute.cc tests_atomsmasher_DEPENDENCIES= $(TESTS_LDADDS) -tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) $(LIBSASL) +tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) noinst_PROGRAMS+= tests/atomsmasher tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) tests_testudp_SOURCES= tests/mem_udp.cc tests_testudp_DEPENDENCIES= $(TESTS_LDADDS) -tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL) +tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) check_PROGRAMS+= tests/testudp noinst_PROGRAMS+= tests/testudp @@ -124,36 +174,84 @@ tests_memcapable_LDADD= $(tests_memcapable_DEPENDENCIES) 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) +tests_memstat_LDADD= $(tests_memstat_DEPENDENCIES) +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) +tests_memcp_LDADD= $(tests_memcp_DEPENDENCIES) +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) +tests_memflush_LDADD= $(tests_memflush_DEPENDENCIES) +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) +tests_memrm_LDADD= $(tests_memrm_DEPENDENCIES) +check_PROGRAMS+= tests/memrm +noinst_PROGRAMS+= tests/memrm + +tests_memcat_SOURCES= tests/memcat.cc +tests_memcat_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX) +tests_memcat_DEPENDENCIES= libtest/libtest.la $(TESTS_LDADDS) +tests_memcat_LDADD= $(tests_memcat_DEPENDENCIES) +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) +tests_memerror_LDADD= $(tests_memerror_DEPENDENCIES) +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) +tests_memslap_LDADD= $(tests_memslap_DEPENDENCIES) +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) +tests_memdump_LDADD= $(tests_memdump_DEPENDENCIES) +check_PROGRAMS+= tests/memdump +noinst_PROGRAMS+= tests/memdump + +# Test linking with C application +tests_c_test_SOURCES= tests/c_test.c +tests_c_test_LDADD= libmemcached/libmemcached.la +tests_c_test_DEPENDENCIES= libmemcached/libmemcached.la +check_PROGRAMS+=tests/c_test +noinst_PROGRAMS+=tests/c_test + +# Test linking with C application/SASL include +tests_c_sasl_test_SOURCES= tests/c_sasl_test.c +tests_c_sasl_test_LDADD= libmemcached/libmemcached.la +tests_c_sasl_test_DEPENDENCIES= libmemcached/libmemcached.la +check_PROGRAMS+=tests/c_sasl_test +noinst_PROGRAMS+=tests/c_sasl_test + test: check -check-local: tests/var $(TEST_DOCS) +check-local: $(TEST_DOCS) @echo "Tests completed" -test-x: tests/var test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat +test-x: test-plus test-memcp test-memdump test-memflush test-memstat @echo "Tests completed" -test-memcat: clients/memcat clients/memcp - @echo "Testing memcat" - @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @clients/memcp --servers="localhost:12555" `pwd`/clients/memcp - @clients/memcat --servers="localhost:12555" memcp > `pwd`/tests/scratch - @clients/memcat --servers="localhost:12555" --file=`pwd`/tests/scratch2 memcp -# @diff clients/memcp tests/scratch - @cat `pwd`/tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" - @rm `pwd`/tests/Xumemc.pid - @rm `pwd`/tests/scratch - @rm `pwd`/tests/scratch2 - -valgrind-memcat: clients/memcat clients/memcp - @echo "Testing memcat" - @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @clients/memcp --servers="localhost:12555" clients/memcp - @$(VALGRIND_COMMAND) clients/memcat --servers="localhost:12555" memcp > tests/scratch -# @diff clients/memcp tests/scratch - @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" - @rm tests/Xumemc.pid - @rm tests/scratch - test-memcp: clients/memcp @echo "Testing memcp" @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 @@ -168,22 +266,6 @@ valgrind-memcp: clients/memcat clients/memcp @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @rm tests/Xumemc.pid -test-memrm: clients/memrm clients/memcp - @echo "Testing memrm" - @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @clients/memcp --servers="localhost:12555" clients/memcat - @clients/memrm --servers="localhost:12555" memcat - @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" - @rm tests/Xumemc.pid - -valgrind-memrm: clients/memcat clients/memcp - @echo "Testing memrm" - @@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555 - @clients/memcp --servers="localhost:12555" clients/memcat - @$(VALGRIND_COMMAND) clients/memrm --servers="localhost:12555" memcat - @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 @@ -228,19 +310,11 @@ valgrind-memstat: clients/memstat @cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server" @rm tests/Xumemc.pid -test-memerror: clients/memerror - @echo "Testing memerror" - @clients/memerror 0 > /dev/null - -valgrind-memerror: clients/memerror - @echo "Testing memerror" - @$(VALGRIND_COMMAND) clients/memerror 0 > /dev/null - test-mem: tests/var tests/testapp @tests/testapp -test-udp: tests/var tests/testudp - @tests/testudp +test-sasl: tests/sasl + @tests/sasl test-atom: tests/var tests/atomsmasher @tests/atomsmasher @@ -266,6 +340,9 @@ pahole-mem: tests/testapp gdb-mem: tests/testapp @$(DEBUG_COMMAND) tests/testapp +gdb-sasl: tests/sasl + @$(DEBUG_COMMAND) tests/sasl + gdb-atom: tests/atomsmasher @$(DEBUG_COMMAND) tests/testudp @@ -284,8 +361,8 @@ gdb-hashplus: tests/hash_plus gdb-cycle: tests/cycle @$(DEBUG_COMMAND) tests/cycle -gdb-memslap: clients/memslap - @$(DEBUG_COMMAND) clients/memslap +gdb-failure: tests/failure + @$(DEBUG_COMMAND) tests/failure valgrind-cycle: tests/cycle $(VALGRIND_COMMAND) tests/cycle @@ -293,6 +370,9 @@ valgrind-cycle: tests/cycle valgrind-mem: tests/testapp @$(VALGRIND_COMMAND) tests/testapp +valgrind-failure: tests/failure + @$(VALGRIND_COMMAND) tests/failure + valgrind-atom: tests/atomsmasher $(VALGRIND_COMMAND) tests/atomsmasher @@ -302,15 +382,15 @@ valgrind-udp: tests/testudp valgrind-plus: tests/testplus @$(VALGRIND_COMMAND) tests/testplus +valgrind-sasl: tests/sasl + @$(VALGRIND_COMMAND) tests/sasl + valgrind-hash: tests/testhashkit @$(VALGRIND_COMMAND) tests/testhashkit valgrind-hashplus: tests/hash_plus @$(VALGRIND_COMMAND) tests/hash_plus -.PHONY += valgrind -valgrind: valgrind-cycle valgrind-mem valgrind-udp valgrind-plus valgrind-hash valgrind-hashplus - helgrind-cycle: tests/cycle @$(HELGRIND_COMMAND) tests/cycle @@ -349,7 +429,5 @@ 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 -test-no-outputdiff: test - hudson-valgrind: tests/testapp $(VALGRIND_COMMAND) --log-file=tests/valgrind.out tests/testapp