X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=tests%2Finclude.am;h=7e924604831d00b9fac7f58dd3cf64459736b046;hb=f59fd04d7f72f556edafd63d58e6bf0b8335c016;hp=b8e9e17f52f10e89cab1d8f927e2f5609342212a;hpb=facfe08e21d2c3135c508ff098ff603ddaacef3e;p=awesomized%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index b8e9e17f..7e924604 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -13,10 +13,6 @@ TESTS_LDADDS+= libmemcached/libmemcached.la
 TESTS_LDADDS+= libmemcached/libmemcachedutil.la
 TESTS_LDADDS+= libtest/libtest.la
 
-DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
-
-PAHOLE_COMMAND= $(LIBTOOL) --mode=execute pahole
-
 EXTRA_DIST+= tests/cpp_example.cc
 
 noinst_HEADERS+= tests/exist.h
@@ -25,7 +21,7 @@ noinst_HEADERS+= tests/keys.hpp
 noinst_HEADERS+= tests/libmemcached_test_container.h
 noinst_HEADERS+= tests/libmemcached_world.h
 noinst_HEADERS+= tests/libmemcached_world_socket.h
-noinst_HEADERS+= tests/memc.h
+noinst_HEADERS+= tests/memc.hpp
 noinst_HEADERS+= tests/runner.h
 
 # Cycle should always run first
@@ -62,7 +58,7 @@ test-failure: tests/failure
 	@tests/failure
 
 gdb-failure: tests/failure
-	@$(DEBUG_COMMAND) tests/failure
+	@$(GDB_COMMAND) tests/failure
 
 
 tests_testhashkit_SOURCES= tests/hashkit_functions.cc
@@ -86,15 +82,9 @@ include tests/cli.am
 
 test: check
 
-check-local: $(TEST_DOCS)
-	@echo "Tests completed"
-
 test-mem: tests/libmemcached-1.0/testapp
 	@tests/libmemcached-1.0/testapp
 
-test-sasl: tests/sasl
-	@tests/sasl
-
 test-atom: tests/atomsmasher
 	@tests/atomsmasher
 
@@ -107,26 +97,26 @@ 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
 
 gdb-mem: tests/libmemcached-1.0/testapp
-	@$(DEBUG_COMMAND)  tests/libmemcached-1.0/testapp
-
-gdb-sasl: tests/sasl
-	@$(DEBUG_COMMAND)  tests/sasl
+	@$(GDB_COMMAND)  tests/libmemcached-1.0/testapp
 
 gdb-atom: tests/atomsmasher
-	@$(DEBUG_COMMAND) tests/atomsmasher
+	@$(GDB_COMMAND) tests/atomsmasher
 
 gdb-hash: tests/testhashkit
-	@$(DEBUG_COMMAND) tests/testhashkit
+	@$(GDB_COMMAND) tests/testhashkit
 
 gdb-hashplus: tests/hash_plus
-	@$(DEBUG_COMMAND) tests/hash_plus
+	@$(GDB_COMMAND) tests/hash_plus
 
 gdb-cycle: tests/cycle
-	@$(DEBUG_COMMAND) tests/cycle
+	@$(GDB_COMMAND) tests/cycle
 
 valgrind-cycle: tests/cycle
 	$(VALGRIND_COMMAND) tests/cycle