Merge Andre

[m6w6/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index e1bf136884e84cb481d1666b1e4283c9567c0fd8..2577e2f46f92f65ee24cdccc9a3d6998f0db80cd 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -8,6 +8,8 @@ VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-rea
 
 DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
 
+PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
+
 if BUILD_LIBMEMCACHEDUTIL
 TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 endif
@@ -34,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
@@ -47,35 +52,52 @@ 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)
 
-test: test-docs test-plus test-mem test-hash memcapable
+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"
 
 test-x: test-docs test-plus test-mem test-hash memcapable test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
@@ -197,36 +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)
 
@@ -236,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)