X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=420435d5a75e2b67fd3762e588228c140a98a261;hb=dc421179c0d159f1ca8a6b2b64b89163a7e0c639;hp=490ed023d527adcb1a6c28a7a47eb9ad8cfd2a95;hpb=de46e62fe493ce152e1804feec0d19d5d0cfaa9f;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index 490ed023..420435d5 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -35,6 +35,7 @@ noinst_HEADERS+= \
 		 tests/ketama_test_cases_spy.h \
 		 tests/libmemcached_world.h \
 		 tests/parser.h \
+		 tests/pool.h \
 		 tests/print.h \
 		 tests/replication.h \
 		 tests/string.h \
@@ -43,8 +44,7 @@ noinst_HEADERS+= \
 
 noinst_PROGRAMS+= \
 		  tests/atomsmasher \
-		  tests/hashplus \
-		  tests/memplus \
+		  tests/hash_plus \
 		  tests/startservers \
 		  tests/testapp \
 		  tests/testhashkit \
@@ -57,6 +57,7 @@ tests_testapp_SOURCES= \
 		       tests/error_conditions.cc \
 		       tests/mem_functions.c \
 		       tests/parser.cc \
+		       tests/pool.cc \
 		       tests/print.cc \
 		       tests/replication.cc \
 		       tests/string.cc \
@@ -100,19 +101,15 @@ tests_testhashkit_SOURCES = tests/hashkit_functions.c
 tests_testhashkit_DEPENDENCIES = libtest/libtest.la libhashkit/libhashkit.la
 tests_testhashkit_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
 
-tests_hashplus_SOURCES = tests/hash_plus.cc
-tests_hashplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_hashplus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES)
-tests_hashplus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
-
-tests_memplus_SOURCES = tests/mem_plus.cc
-tests_memplus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
-tests_memplus_DEPENDENCIES = $(TESTS_LDADDS)
-tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES) $(LIBSASL)
+tests_hash_plus_SOURCES = tests/hash_plus.cc
+tests_hash_plus_CXXFLAGS = $(AM_CXXFLAGS) $(NO_EFF_CXX)
+tests_hash_plus_DEPENDENCIES = $(tests_testhashkit_DEPENDENCIES)
+tests_hash_plus_LDADD = $(tests_testhashkit_DEPENDENCIES) $(LIBSASL)
+check_PROGRAMS+= tests/hash_plus
 
 test: check
 
-check-local: $(TEST_DOCS) test-mem test-hash memcapable
+check-local: tests/var $(TEST_DOCS) test-mem test-hash memcapable
 	@echo "Tests completed"
 
 test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
@@ -238,8 +235,6 @@ MEM_COMMAND= tests/testapp $(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)
@@ -248,7 +243,7 @@ UDP_COMMAND= tests/testudp $(COLLECTION) $(SUITE)
 
 HASH_COMMAND= tests/testhashkit $(COLLECTION) $(SUITE)
 
-test-mem: tests/testapp support/example.cnf
+test-mem: tests/testapp
 	$(MEM_COMMAND)
 
 test-udp: tests/testudp
@@ -266,9 +261,6 @@ test-hash: tests/testhashkit
 test-hashplus: tests/hashplus
 	$(HASHPLUS_COMMAND)
 
-test-memplus: tests/memplus
-	$(MEMPLUS_COMMAND)
-
 pahole-mem: tests/testapp
 	$(PAHOLE_COMMAND)  $(MEM_COMMAND)
 
@@ -290,9 +282,6 @@ gdb-hash: tests/testhashkit
 gdb-hashplus: tests/hashplus
 	$(DEBUG_COMMAND) $(HASHPLUS_COMMAND)
 
-gdb-memplus: tests/memplus
-	$(DEBUG_COMMAND) $(MEMPLUS_COMMAND)
-
 gdb-memslap: clients/memslap
 	$(DEBUG_COMMAND)  $(MEMSLAP_COMMAND)
 
@@ -314,9 +303,6 @@ valgrind-hash: tests/testhashkit
 valgrind-hashplus: tests/hashplus
 	$(VALGRIND_COMMAND) $(HASHPLUS_COMMAND)
 
-valgrind-memplus: tests/memplus
-	$(VALGRIND_COMMAND) $(MEMPLUS_COMMAND)
-
 valgrind-memslap: clients/memslap
 	$(VALGRIND_COMMAND) $(MEMSLAP_COMMAND)