[SCM] Packaging of Memcached::libmemcached in Debian branch, master, updated. upstream/0.4406-2-g0a42ac0

Harlan Lieberman-Berg H.LiebermanBerg at gmail.com
Thu Sep 22 21:08:04 UTC 2011


The following commit has been merged in the master branch:
commit 0a42ac03124ed6f66d8111c2d5de702f12e6871c
Author: Harlan Lieberman-Berg <H.LiebermanBerg at gmail.com>
Date:   Thu Sep 22 17:07:39 2011 -0400

    Another attempt at ansgar's method.

diff --git a/debian/rules b/debian/rules
index 0f55baf..c1424a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,13 @@
 #!/usr/bin/make -f
 
-TESTDIR=$(shell mktemp -d)
-PIDFILE=$(TESTDIR)/memcached.pid
-SOCKET=$(TESTDIR)/memcached.sock
-
 %:
 	dh $@
 
 override_dh_auto_test:
-	mkdir -p $(TESTDIR)
-	memcached -d -s $(TESTDIR) -P $(PIDFILE)
-	PERL_LIBMEMCACHED_TEST_SERVERS=$(SOCKET) dh_auto_test
-	[ ! -f $(PIDFILE) ] || kill $(shell cat $(PIDFILE))
-	$(RM) -r $(TESTDIR)
+	set -e
+	TESTDIR=$$(mktemp -d)
+	PIDFILE=$$TESTDIR/memcached.pid
+	SOCKET=$$TESTDIR/memcached.sock
+	trap '[ ! -f $$PIDFILE ] || kill $$(cat $$PIDFILE); rm -rf -- $$TESTDIR' EXIT
+	memcached -d -s $$SOCKET -P $$PIDFILE -u nobody
+	PERL_LIBMEMCACHED_TEST_SERVERS=$$SOCKET dh_auto_test

-- 
Packaging of Memcached::libmemcached in Debian



More information about the Pkg-perl-cvs-commits mailing list