Update tests for testplus.

[m6w6/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index 259da130cfd70f9d475ab0aae161e55c98d7bcbc..1c54c1f568e0661f11dea73ade637b2f5138d87d 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -37,8 +37,7 @@ noinst_PROGRAMS+= \
                  tests/startservers \
                  tests/testapp \
                  tests/testhashkit \
-                 tests/testplus \
-                 tests/udptest
+                 tests/testplus
 
 noinst_LTLIBRARIES+= tests/libserver.la
 tests_libserver_la_SOURCES= tests/server.c
@@ -60,10 +59,6 @@ tests_testplus_SOURCES= tests/plus.cpp
 tests_testplus_LDADD= tests/libtest.la tests/libserver.la $(TESTS_LDADDS)
 tests_testplus_DEPENDENCIES= $(tests_testplus_LDADD)
 
-tests_udptest_SOURCES= tests/udp.c
-tests_udptest_LDADD= tests/libtest.la tests/libserver.la $(TESTS_LDADDS)
-tests_udptest_DEPENDENCIES= $(tests_udptest_LDADD)
-
 tests_atomsmasher_SOURCES= tests/atomsmasher.c
 tests_atomsmasher_LDADD= \
        clients/libgenexec.la \
@@ -119,28 +114,57 @@ clients:
        cat tests/Xumemc.pid | xargs kill
        rm tests/Xumemc.pid
 
+MEMSLAP_COMMAND= clients/memslap $(COLLECTION) $(SUITE)
+
 MEM_COMMAND= tests/testapp $(COLLECTION) $(SUITE)
 
+PLUS_COMMAND= tests/testplus $(COLLECTION) $(SUITE)
+
+ATOM_COMMAND= tests/atomsmasher $(COLLECTION) $(SUITE)
+
 HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
 
-test-mem:
+test-mem: tests/testapp
        $(MEM_COMMAND)
 
-test-hash:
+test-atom: tests/atomsmasher
+       $(ATOM_COMMAND)
+
+test-plus: tests/testplus
+       $(PLUS_COMMAND)
+
+test-hash: tests/testhashkit
        $(HASH_COMMAND)
 
-gdb-mem:
+gdb-mem: tests/testapp
        $(DEBUG_COMMAND)  $(MEM_COMMAND)
 
-gdb-hash:
+gdb-atom: tests/atomsmasher
+       $(DEBUG_COMMAND)  $(ATOM_COMMAND)
+
+gdb-plus: tests/testplus
+       $(DEBUG_COMMAND)  $(PLUS_COMMAND)
+
+gdb-hash: tests/testhashkit
        $(DEBUG_COMMAND) $(HASH_COMMAND)
 
-valgrind-mem:
+gdb-memslap: clients/memslap
+       $(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
+
+valgrind-mem: tests/testapp
        $(VALGRIND_COMMAND)  $(MEM_COMMAND)
 
-valgrind-hash:
+valgrind-atom: tests/atomsmasher
+       $(VALGRIND_COMMAND)  $(ATOM_COMMAND)
+
+valgrind-plus: tests/testplus
+       $(VALGRIND_COMMAND)  $(PLUS_COMMAND)
+
+valgrind-hash: tests/testhashkit
        $(VALGRIND_COMMAND) $(HASH_COMMAND)
 
+valgrind-memslap: clients/memslap
+       $(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)
 
 PHONY += valgrind
 valgrind: tests/testapp tests/testhashkit valgrind-mem valgrind-hash 
@@ -171,5 +195,5 @@ helgrind-slap:
 
 test-no-outputdiff: test
 
-hudson-valgrind:
-       $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --log-file=tests/valgrind.out tests/testapp
+hudson-valgrind: tests/testapp
+       $(VALGRIND_COMMAND) --log-file=tests/valgrind.out $(MEM_COMMAND)