From 9ce3e1296992387cf9a2bdbdeabf624ba1881b40 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 17 Jan 2017 12:13:17 +0000 Subject: test suite: gitattributes: Break out dscf= setting No functional change. Signed-off-by: Ian Jackson --- tests/tests/gitattributes | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes index 0f71c33..a0e436d 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 -- cgit v1.2.3