This fixes lp:1010899, which showed a condition where we could end up with a bad...

[m6w6/libmemcached] / tests / include.am

diff --git a/tests/include.am b/tests/include.am
index 165b79b8e78d9d813a256b988d07a15f9959d021..b8e9e17f52f10e89cab1d8f927e2f5609342212a 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
@@ -56,12 +58,23 @@ tests_failure_LDADD= $(tests_failure_DEPENDENCIES)
 check_PROGRAMS+= tests/failure
 noinst_PROGRAMS+= tests/failure
 
-tests_testhashkit_SOURCES = tests/hashkit_functions.cc
-tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
-tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES)
+test-failure: tests/failure
+       @tests/failure
+
+gdb-failure: tests/failure
+       @$(DEBUG_COMMAND) tests/failure
+
+
+tests_testhashkit_SOURCES= tests/hashkit_functions.cc
+tests_testhashkit_DEPENDENCIES= libtest/libtest.la libhashkit/libhashkit.la $(TESTS_LDADDS)
+tests_testhashkit_LDADD= $(tests_testhashkit_DEPENDENCIES)
 check_PROGRAMS+= tests/testhashkit
 noinst_PROGRAMS+= tests/testhashkit
 
+test-hash: tests/testhashkit
+       @tests/testhashkit
+
+
 tests_hash_plus_SOURCES= tests/hash_plus.cc
 tests_hash_plus_CXXFLAGS= $(AM_CXXFLAGS) $(NO_EFF_CXX)
 tests_hash_plus_DEPENDENCIES= $(tests_testhashkit_DEPENDENCIES)
@@ -85,12 +98,6 @@ test-sasl: tests/sasl
 test-atom: tests/atomsmasher
        @tests/atomsmasher
 
-test-plus: tests/testplus
-       @tests/testplus
-
-test-hash: tests/testhashkit
-       @tests/testhashkit
-
 test-hashplus: tests/hash_plus
        @tests/hash_plus
 
@@ -112,9 +119,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
 
@@ -124,9 +128,6 @@ gdb-hashplus: tests/hash_plus
 gdb-cycle: tests/cycle
        @$(DEBUG_COMMAND) tests/cycle
 
-gdb-failure: tests/failure
-       @$(DEBUG_COMMAND) tests/failure
-
 valgrind-cycle: tests/cycle
        $(VALGRIND_COMMAND) tests/cycle
 
@@ -139,9 +140,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
 
@@ -160,9 +158,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