From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 7 Aug 2016 19:52:11 +0000 (+0100)
Subject: Test suite: t-setup-*: Fix lock path
X-Git-Tag: archive/debian/2.0~209
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f160edc257cda7203330cfb644464f09470de32f;ds=sidebyside

Test suite: t-setup-*: Fix lock path

Needs to be not in a directory which may not exist yet.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/lib b/tests/lib
index 81accebf..c81a7922 100644
--- a/tests/lib
+++ b/tests/lib
@@ -398,18 +398,22 @@ t-setup-done () {
 t-setup-import () {
 	local setupname=$1
 
+	local setupsrc
+	local lock
 	if [ "x$tmpbase" = x ]; then
 		# ADTTMP was set on entry to tests/lib, so we
 		# are not sharing tmp area between tests
 		setupsrc="$tmp"
+		lock="$tmp/.dummy.lock"
 	else
 		setupsrc="$tmpbase/$setupname"
+		lock="$setupsrc.lock"
 	fi
 
 	local simport="$setupsrc/IMPORT"
 
 	if ! [ -e "$simport" ]; then
-		with-lock-ex -w "$simport.lock" \
+		with-lock-ex -w "$lock" \
 		xargs -0 -a $tmp/.save-env \
 		bash -xec '
 			cd "$1"; shift