From: Monty Taylor <mordred@inaugust.com>
Date: Thu, 17 Dec 2009 21:29:24 +0000 (-0800)
Subject: -P seems to want an abs path.
X-Git-Tag: 0.37~57^2~2
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=3107b89b4d3441929835e6f96fda841c76f704fe;p=awesomized%2Flibmemcached

-P seems to want an abs path.
---

diff --git a/Makefile.am b/Makefile.am
index 2533593b..0bfe7ccd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,17 +26,6 @@ include support/include.am
 
 check-local: test-no-outputdiff
 
-test: all
-	@(cd tests; ${MAKE} test)
-
-test-extended: all
-	@(cd tests; ${MAKE} test-extended)
-
-valgrind: all
-	@(cd tests; ${MAKE} valgrind)
-
-test-no-outputdiff:
-	@(cd tests; ${MAKE} test-no-outputdiff)
 
 fedora:
 	rm -f ~/rpmbuild/RPMS/x86_64/libmemcached-$(VERSION)*.rpm
@@ -62,5 +51,3 @@ merge-clean:
 	find ./ | $(GREP) \~$$ | xargs rm -f
 	bzr unknowns
 
-hudson-valgrind: all
-	@(cd tests; ${MAKE} hudson-valgrind)
diff --git a/tests/include.am b/tests/include.am
index 9c0ec5cf..32f044c9 100644
--- a/tests/include.am
+++ b/tests/include.am
@@ -80,14 +80,14 @@ library_test:
 #	tests/testplus
 
 memcapable: clients/memcapable
-	@MEMC_BINARY@ -d -P tests/Xumemc.pid -p 12555
+	@MEMC_BINARY@ -d -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
 
 PHONY += clients
 clients:
-	@MEMC_BINARY@ -d -P tests/Xumemc.pid -p 12555
+	@MEMC_BINARY@ -d -P `pwd`/tests/Xumemc.pid -p 12555
 	export MEMCACHED_SERVERS="localhost:12555"
 	sh tests/t/memcat.test > tests/r/memcat.cmp
 	diff tests/r/memcat.res tests/r/memcat.cmp