-P seems to want an abs path.

diff --git a/Makefile.am b/Makefile.am
index 2533593b1f344b235d4752ef50c788076d98c929..0bfe7ccd453ebf58d314185d90daa70a7d2ce3e9 100644 (file)
--- 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 9c0ec5cfceb45429da95486b60d583272dff314d..32f044c9c828e6f53131156b2577a68a5228f9ff 100644 (file)
--- 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