Updating from Monty

diff --combined tests/include.am
index 08cf67e2d9d8db9b5d90877da97d424f6e66ef84,c29899fd4471861eaf5089839002ed680ae6a4ba..593c98fa9e6fa802fdfe3724354fcd0beee14ea5
--- 1/tests/include.am
--- 2/tests/include.am
+++ b/tests/include.am
@@@ -4,7 -4,7 +4,7 @@@
  
  TESTS_LDADDS = libmemcached/libmemcached.la
  
 -VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes
 +VALGRIND_COMMAND= $(LIBTOOL) --mode=execute valgrind --leak-check=yes --show-reachable=yes --track-fds=yes
  
  DEBUG_COMMAND= $(LIBTOOL) --mode=execute gdb
  
@@@ -89,10 -89,12 +89,12 @@@ tests_memplus_CXXFLAGS = $(AM_CXXFLAGS
  tests_memplus_DEPENDENCIES = tests/libtest.la tests/libserver.la libmemcached/libmemcached.la
  tests_memplus_LDADD = $(tests_memplus_DEPENDENCIES)
  
- test: unittests-run test-docs test-mem test-hash memcapable
+ test: check
+ 
+ check-local: test-docs test-mem test-hash memcapable
        echo "Tests completed"
  
- test-x: test-docs test-plus test-mem test-hash memcapable test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
+ test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
        echo "Tests completed"
  
  memcapable: clients/memcapable