Update tests for testplus.

[m6w6/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index b13674ec346ea83739585c30230d7f517943572d..1c54c1f568e0661f11dea73ade637b2f5138d87d 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -4,37 +4,40 @@
 
 TESTS_LDADDS = libmemcached/libmemcached.la
 
+VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
+
+DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
+
 if BUILD_LIBMEMCACHEDUTIL
 TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 endif
 
 EXTRA_DIST+= \
-       tests/r/memcat.res \
-       tests/r/memcp.res \
-       tests/r/memrm.res \
-       tests/r/memslap.res \
-       tests/r/memstat.res \
-       tests/t/memcat.test \
-       tests/t/memcp.test \
-       tests/t/memrm.test \
-       tests/t/memslap.test \
-       tests/t/memstat.test
+            tests/r/memcat.res \
+            tests/r/memcp.res \
+            tests/r/memrm.res \
+            tests/r/memslap.res \
+            tests/r/memstat.res \
+            tests/t/memcat.test \
+            tests/t/memcp.test \
+            tests/t/memrm.test \
+            tests/t/memslap.test \
+            tests/t/memstat.test
 
 noinst_HEADERS+= \
-       tests/hash_results.h \
-       tests/ketama_test_cases.h \
-       tests/ketama_test_cases_spy.h \
-       tests/libmemcached_world.h \
-       tests/server.h \
-       tests/test.h
+                tests/hash_results.h \
+                tests/ketama_test_cases.h \
+                tests/ketama_test_cases_spy.h \
+                tests/libmemcached_world.h \
+                tests/server.h \
+                tests/test.h
 
 noinst_PROGRAMS+= \
-       tests/atomsmasher \
-       tests/startservers \
-       tests/testapp \
-       tests/testhashkit \
-       tests/testplus \
-       tests/udptest
+                 tests/atomsmasher \
+                 tests/startservers \
+                 tests/testapp \
+                 tests/testhashkit \
+                 tests/testplus
 
 noinst_LTLIBRARIES+= tests/libserver.la
 tests_libserver_la_SOURCES= tests/server.c
@@ -43,7 +46,7 @@ noinst_LTLIBRARIES+= tests/libtest.la
 tests_libtest_la_SOURCES= tests/test.c
 
 tests_testapp_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
-tests_testapp_SOURCES= tests/function.c
+tests_testapp_SOURCES= tests/mem_functions.c
 tests_testapp_LDADD= \
        clients/libgenexec.la \
        tests/libserver.la \
@@ -56,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 \
@@ -83,10 +82,10 @@ client-record:
        sh tests/t/memslap.test > tests/r/memslap.res
        sh tests/t/memstat.test > tests/r/memstat.res
 
-test: test-docs tests/testapp tests/testplus library_test memcapable libmhashkit_test
+test: test-docs tests/testplus library_test memcapable libmhashkit_test
        echo "Tests completed"
 
-library_test:
+library_test: tests/testapp
        tests/testapp
 
 libmhashkit_test: libhashkit
@@ -115,16 +114,60 @@ clients:
        cat tests/Xumemc.pid | xargs kill
        rm tests/Xumemc.pid
 
-gdb-mem:
-       $(LIBTOOL) --mode=execute gdb tests/testapp
+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: tests/testapp
+       $(MEM_COMMAND)
+
+test-atom: tests/atomsmasher
+       $(ATOM_COMMAND)
+
+test-plus: tests/testplus
+       $(PLUS_COMMAND)
+
+test-hash: tests/testhashkit
+       $(HASH_COMMAND)
+
+gdb-mem: tests/testapp
+       $(DEBUG_COMMAND)  $(MEM_COMMAND)
+
+gdb-atom: tests/atomsmasher
+       $(DEBUG_COMMAND)  $(ATOM_COMMAND)
+
+gdb-plus: tests/testplus
+       $(DEBUG_COMMAND)  $(PLUS_COMMAND)
+
+gdb-hash: tests/testhashkit
+       $(DEBUG_COMMAND) $(HASH_COMMAND)
+
+gdb-memslap: clients/memslap
+       $(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
+
+valgrind-mem: tests/testapp
+       $(VALGRIND_COMMAND)  $(MEM_COMMAND)
+
+valgrind-atom: tests/atomsmasher
+       $(VALGRIND_COMMAND)  $(ATOM_COMMAND)
+
+valgrind-plus: tests/testplus
+       $(VALGRIND_COMMAND)  $(PLUS_COMMAND)
 
-gdb-hash:
-       $(LIBTOOL) --mode=execute gdb tests/testhashkit
+valgrind-hash: tests/testhashkit
+       $(VALGRIND_COMMAND) $(HASH_COMMAND)
 
+valgrind-memslap: clients/memslap
+       $(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)
 
 PHONY += valgrind
-valgrind:
-       $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes  tests/testapp
+valgrind: tests/testapp tests/testhashkit valgrind-mem valgrind-hash 
 
 PHONY += cachegrind
 CLEANFILES += tests/cachegrind.out
@@ -152,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)