From: Brian Aker <brian@gaz>
Date: Wed, 28 Jul 2010 00:27:30 +0000 (-0700)
Subject: Merge Trond --without-docs
X-Git-Tag: 0.44~13
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=36583b08f3d20bebd7d9874dd08131e1b3c6ffaf;p=m6w6%2Flibmemcached

Merge Trond --without-docs
---

36583b08f3d20bebd7d9874dd08131e1b3c6ffaf
diff --cc tests/include.am
index 64875115,7a9c2062..501939df
--- a/tests/include.am
+++ b/tests/include.am
@@@ -91,14 -91,14 +91,14 @@@ tests_memplus_LDADD = $(tests_memplus_D
  
  test: check
  
- check-local: test-docs test-mem test-hash memcapable
+ check-local: $(TEST_DOCS) test-mem test-hash memcapable
 -	echo "Tests completed"
 +	@echo "Tests completed"
  
  test-x: check-local test-plus test-memcat test-memcp test-memrm test-memerror test-memdump test-memflush test-memstat
 -	echo "Tests completed"
 +	@echo "Tests completed"
  
  memcapable: clients/memcapable
 -	@@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
 +	@@MEMC_BINARY@ -d -u root -P `pwd`/tests/Xumemc.pid -p 12555
  	@clients/memcapable -p 12555 || echo "Your memcached server does not support all commands"
  	@cat tests/Xumemc.pid | xargs kill || echo "Failed to kill memcached server"
  	@rm tests/Xumemc.pid