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 0f71c335b8657c957a92cea4627483874f8020da..a0e436d24a4c13bf830a47e773394de2fb0d5ff7 100755 (executable)
--- 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