Merge lp:~tangent-org/libmemcached/1.0-build Build: jenkins-Libmemcached-1.0-28

[awesomized/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index 938014222884057540dacd87b822229bdabf9741..2538d51c5d83d4ea73206fc21d485236c4b0d569 100644 (file)
--- a/tests/include.am
+++ b/tests/include.am
@@ -41,6 +41,8 @@ noinst_PROGRAMS+= tests/cycle
 
 include tests/libmemcached-1.0/include.am
 
+include tests/parser.am
+
 tests_failure_SOURCES=
 tests_failure_SOURCES+= tests/failure.cc
 tests_failure_SOURCES+= clients/execute.cc
@@ -96,9 +98,6 @@ test-sasl: tests/sasl
 test-atom: tests/atomsmasher
        @tests/atomsmasher
 
-test-plus: tests/testplus
-       @tests/testplus
-
 test-hashplus: tests/hash_plus
        @tests/hash_plus
 
@@ -108,6 +107,9 @@ test-cycle: tests/cycle
 test-memcapable: tests/memcapable
        @tests/memcapable
 
+valgrind-memcapable: tests/memcapable
+       $(VALGRIND_COMMAND) tests/memcapable
+
 pahole-mem: tests/testapp
        @$(PAHOLE_COMMAND)  tests/testapp
 
@@ -120,9 +122,6 @@ gdb-sasl: tests/sasl
 gdb-atom: tests/atomsmasher
        @$(DEBUG_COMMAND) tests/atomsmasher
 
-gdb-plus: tests/testplus
-       $(DEBUG_COMMAND) tests/testplus
-
 gdb-hash: tests/testhashkit
        @$(DEBUG_COMMAND) tests/testhashkit
 
@@ -144,9 +143,6 @@ valgrind-failure: tests/failure
 valgrind-atom: tests/atomsmasher
        $(VALGRIND_COMMAND) tests/atomsmasher
 
-valgrind-plus: tests/testplus
-       @$(VALGRIND_COMMAND) tests/testplus
-
 valgrind-sasl: tests/sasl
        @$(VALGRIND_COMMAND) tests/sasl
 
@@ -165,9 +161,6 @@ helgrind-mem: tests/libmemcached-1.0/testapp
 helgrind-atom: tests/atomsmasher
        @$(HELGRIND_COMMAND) tests/atomsmasher
 
-helgrind-plus: tests/testplus
-       @$(HELGRIND_COMMAND) tests/testplus
-
 helgrind-hash: tests/testhashkit
        @$(HELGRIND_COMMAND) tests/testhashkit