From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 17 Jan 2017 12:13:17 +0000 (+0000)
Subject: test suite: gitattributes: Break out dscf= setting
X-Git-Tag: archive/debian/3.5~22
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9ce3e1296992387cf9a2bdbdeabf624ba1881b40;p=dgit.git

test suite: gitattributes: Break out dscf= setting

No functional change.

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

diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index 0f71c335..a0e436d2 100755
--- a/tests/tests/gitattributes
+++ b/tests/tests/gitattributes
@@ -107,13 +107,14 @@ sfmt_import () {
 	dgitargs=$2
 	refname="import.$sfmt-$inst"
 	brkerr=stderr.$sfmt-$inst.broken
+	dscf=${p}_${v}.dsc
 
 	mkdir $pdb-import-$inst
 	cd $pdb-import-$inst
 	git init
 
 	LC_MESSAGES=C \
-	t-dgit $dgitargs import-dsc ../${p}_${v}.dsc +$refname.broken \
+	t-dgit $dgitargs import-dsc ../$dscf +$refname.broken \
 		2>&1 |tee ../$brkerr
 	fgrep 'warning: source tree contains .gitattributes' ../$brkerr
 	git checkout $refname.broken
@@ -131,7 +132,7 @@ sfmt_import () {
 
 	t-dgit setup-new-tree
 
-	t-dgit $dgitargs import-dsc ../${p}_${v}.dsc +$refname
+	t-dgit $dgitargs import-dsc ../$dscf +$refname
 	git checkout $refname
 
 	sums=sums.$sfmt-$inst