X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=be3e336399882c497585d8764cf486401710f9af;hb=ea260e7bce23c9a41c3c60fd68f55b33608714a9;hp=bbfaebd56ef412bc28af5b8b5942b212ad34c90d;hpb=58f1d68c19b4bebeefb6faa6c3ba85ba5a6b1057;p=m6w6%2Flibmemcached diff --git a/tests/include.am b/tests/include.am index bbfaebd5..be3e3363 100644 --- a/tests/include.am +++ b/tests/include.am @@ -36,10 +36,13 @@ noinst_HEADERS+= \ noinst_PROGRAMS+= \ tests/atomsmasher \ + tests/hashplus \ + tests/memplus \ tests/startservers \ tests/testapp \ tests/testhashkit \ - tests/testplus + tests/testplus \ + tests/testudp noinst_LTLIBRARIES+= tests/libserver.la tests_libserver_la_SOURCES= tests/server.c @@ -49,33 +52,50 @@ tests_libtest_la_SOURCES= tests/test.c tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) tests_testapp_SOURCES= tests/mem_functions.c -tests_testapp_LDADD= \ +tests_testapp_DEPENDENCIES= \ + clients/libgenexec.la \ + tests/libserver.la \ + tests/libtest.la \ + libmemcached/libmemcachedinternal.la \ + $(TESTS_LDADDS) +tests_testapp_LDADD= $(tests_testapp_DEPENDENCIES) $(LIBSASL) + +tests_testplus_SOURCES= tests/plus.cpp +tests_testplus_DEPENDENCIES= tests/libtest.la tests/libserver.la $(TESTS_LDADDS) +tests_testplus_LDADD= $(tests_testplus_DEPENDENCIES) $(LIBSASL) + +tests_atomsmasher_SOURCES= tests/atomsmasher.c +tests_atomsmasher_DEPENDENCIES= \ clients/libgenexec.la \ tests/libserver.la \ tests/libtest.la \ - libmemcached/libmemcachedinternal.la \ $(TESTS_LDADDS) -tests_testapp_DEPENDENCIES= $(tests_testapp_LDADD) - -tests_testplus_SOURCES= tests/plus.cpp -tests_testplus_LDADD= tests/libtest.la tests/libserver.la $(TESTS_LDADDS) -tests_testplus_DEPENDENCIES= $(tests_testplus_LDADD) +tests_atomsmasher_LDADD= $(tests_atomsmasher_DEPENDENCIES) $(LIBSASL) -tests_atomsmasher_SOURCES= tests/atomsmasher.c -tests_atomsmasher_LDADD= \ +tests_testudp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING) +tests_testudp_SOURCES= tests/mem_udp.c +tests_testudp_DEPENDENCIES= \ clients/libgenexec.la \ tests/libserver.la \ tests/libtest.la \ $(TESTS_LDADDS) -tests_atomsmasher_DEPENDENCIES= $(tests_atomsmasher_LDADD) +tests_testudp_LDADD= $(tests_testudp_DEPENDENCIES) $(LIBSASL) tests_startservers_SOURCES= tests/start.c -tests_startservers_LDADD= tests/libserver.la $(TESTS_LDADDS) -tests_startservers_DEPENDENCIES= $(tests_startservers_LDADD) +tests_startservers_DEPENDENCIES= tests/libserver.la $(TESTS_LDADDS) +tests_startservers_LDADD= $(tests_startservers_DEPENDENCIES) $(LIBSASL) tests_testhashkit_SOURCES = tests/hashkit_functions.c -tests_testhashkit_LDADD = tests/libtest.la libhashkit/libhashkit.la -tests_testhashkit_DEPENDENCIES = $(tests_testhashkit_LDADD) +tests_testhashkit_DEPENDENCIES = tests/libtest.la libhashkit/libhashkit.la +tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL) + +tests_hashplus_SOURCES = tests/hash_plus.cc +tests_hashplus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES) +tests_hashplus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL) + +tests_memplus_SOURCES = tests/mem_plus.cc +tests_memplus_DEPENDENCIES = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la +tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES) test: test-docs test-mem test-hash memcapable echo "Tests completed" @@ -141,21 +161,21 @@ valgrind-memrm: clients/memcat clients/memcp test-memflush: clients/memflush @echo "Testing memflush" - @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -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" - @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -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" - @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -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" @@ -163,7 +183,7 @@ test-memdump: clients/memdump clients/memcp valgrind-memdump: clients/memcat clients/memcp @echo "Testing memdump" - @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -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" @@ -171,14 +191,14 @@ valgrind-memdump: clients/memcat clients/memcp test-memstat: clients/memstat @echo "Testing memstat" - @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -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" - @/usr/local/bin/memcached -d -P `pwd`/tests/Xumemc.pid -p 12555 + @$(MEMC_BINARY) -d -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 @@ -199,40 +219,63 @@ MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE) MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE) -PLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE) +TESTPLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE) + +MEMPLUS_COMMAND= tests/memplus $(COLLECTION) $(SUITE) + +HASHPLUS_COMMAND= tests/hashplus $(COLLECTION) $(SUITE) ATOM_COMMAND= tests/atomsmasher $(COLLECTION) $(SUITE) +UDP_COMMAND= tests/testudp $(COLLECTION) $(SUITE) + HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE) test-mem: tests/testapp $(MEM_COMMAND) +test-udp: tests/testudp + $(UDP_COMMAND) + test-atom: tests/atomsmasher $(ATOM_COMMAND) test-plus: tests/testplus - $(PLUS_COMMAND) + $(TESTPLUS_COMMAND) test-hash: tests/testhashkit $(HASH_COMMAND) +test-hashplus: tests/hashplus + $(HASHPLUS_COMMAND) + +test-memplus: tests/memplus + $(MEMPLUS_COMMAND) + pahole-mem: tests/testapp $(PAHOLE_COMMAND) $(MEM_COMMAND) - gdb-mem: tests/testapp $(DEBUG_COMMAND) $(MEM_COMMAND) gdb-atom: tests/atomsmasher + $(DEBUG_COMMAND) $(UDP_COMMAND) + +gdb-udp: tests/testudp $(DEBUG_COMMAND) $(ATOM_COMMAND) gdb-plus: tests/testplus - $(DEBUG_COMMAND) $(PLUS_COMMAND) + $(DEBUG_COMMAND) $(TESTPLUS_COMMAND) gdb-hash: tests/testhashkit $(DEBUG_COMMAND) $(HASH_COMMAND) +gdb-hashplus: tests/hashplus + $(DEBUG_COMMAND) $(HASHPLUS_COMMAND) + +gdb-memplus: tests/memplus + $(DEBUG_COMMAND) $(MEMPLUS_COMMAND) + gdb-memslap: clients/memslap $(DEBUG_COMMAND) $(MEMSLAP_COMMAND) @@ -242,12 +285,21 @@ valgrind-mem: tests/testapp valgrind-atom: tests/atomsmasher $(VALGRIND_COMMAND) $(ATOM_COMMAND) +valgrind-udp: tests/testudp + $(VALGRIND_COMMAND) $(UDP_COMMAND) + valgrind-plus: tests/testplus - $(VALGRIND_COMMAND) $(PLUS_COMMAND) + $(VALGRIND_COMMAND) $(TESTPLUS_COMMAND) valgrind-hash: tests/testhashkit $(VALGRIND_COMMAND) $(HASH_COMMAND) +valgrind-hashplus: tests/hashplus + $(VALGRIND_COMMAND) $(HASHPLUS_COMMAND) + +valgrind-memplus: tests/memplus + $(VALGRIND_COMMAND) $(MEMPLUS_COMMAND) + valgrind-memslap: clients/memslap $(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)