X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=tests%2Finclude.am;h=f4c6dcfd743a8c0161e0074d081d8df310c5e7b9;hb=9c93ec2ff2db02a85ec808947cb10b674c512d0c;hp=41ea2ec33332f7cdcb6abf67a1f40e46316f6e55;hpb=1857b8b7b9c015f917a05e2e1f75c31253855c90;p=m6w6%2Flibmemcached

diff --git a/tests/include.am b/tests/include.am
index 41ea2ec3..f4c6dcfd 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -8,24 +8,23 @@
 # included from Top Level Makefile.am
 # All paths should be given relative to the root
 
-TESTS_LDADDS= \
-	      libmemcached/libmemcached.la \
-	      libmemcached/libmemcachedutil.la \
-	      libtest/libtest.la
+TESTS_LDADDS=
+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 \
-	     tests/output_plus.res
+EXTRA_DIST+= tests/cpp_example.cc
+EXTRA_DIST+= tests/output_plus.res
 
-noinst_HEADERS+= \
-		 tests/exist.h \
-		 tests/hash_results.h \
-		 tests/libmemcached_world.h \
-		 tests/libmemcached_world_socket.h
+noinst_HEADERS+= tests/exist.h
+noinst_HEADERS+= tests/keys.hpp
+noinst_HEADERS+= tests/hash_results.h
+noinst_HEADERS+= tests/libmemcached_world.h
+noinst_HEADERS+= tests/libmemcached_world_socket.h
 
 # Cycle should always run first
 tests_cycle_CFLAGS= $(AM_CFLAGS) $(NO_CONVERSION) $(NO_STRICT_ALIASING)
@@ -67,9 +66,6 @@ test: check
 check-local: $(TEST_DOCS)
 	@echo "Tests completed"
 
-test-x: test-plus test-memcp test-memdump test-memflush test-memstat
-	@echo "Tests completed"
-
 test-mem: tests/var tests/libmemcached-1.0/testapp
 	@tests/libmemcached-1.0/testapp
 
@@ -97,7 +93,7 @@ test-memcapable: tests/var tests/memcapable
 pahole-mem: tests/testapp
 	@$(PAHOLE_COMMAND)  tests/testapp
 
-gdb-mem: tests/var tests/libmemcached-1.0/testapp
+gdb-mem: tests/libmemcached-1.0/testapp
 	@$(DEBUG_COMMAND)  tests/libmemcached-1.0/testapp
 
 gdb-sasl: tests/sasl
@@ -124,8 +120,8 @@ gdb-failure: tests/failure
 valgrind-cycle: tests/cycle
 	$(VALGRIND_COMMAND) tests/cycle
 
-valgrind-mem: tests/testapp
-	@$(VALGRIND_COMMAND) tests/testapp
+valgrind-mem: tests/libmemcached-1.0/testapp
+	@$(VALGRIND_COMMAND) tests/libmemcached-1.0/testapp
 
 valgrind-failure: tests/failure
 	@$(VALGRIND_COMMAND) tests/failure
@@ -148,8 +144,8 @@ valgrind-hashplus: tests/hash_plus
 helgrind-cycle: tests/cycle
 	@$(HELGRIND_COMMAND) tests/cycle
 
-helgrind-mem: tests/testapp
-	@$(HELGRIND_COMMAND) tests/testapp
+helgrind-mem: tests/libmemcached-1.0/testapp
+	@$(HELGRIND_COMMAND) tests/libmemcached-1.0/testapp
 
 helgrind-atom: tests/atomsmasher
 	@$(HELGRIND_COMMAND) tests/atomsmasher