diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-17 12:13:17 +0000 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2017-01-17 12:13:17 +0000 |
commit | 9ce3e1296992387cf9a2bdbdeabf624ba1881b40 (patch) | |
tree | 7a8804d390b55e9160e44613934e1bcc5a527498 /tests/tests | |
parent | 7990c19ca7a5535bee930ab3f6cf7d1c48ab7696 (diff) |
test suite: gitattributes: Break out dscf= setting
No functional change.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests')
-rwxr-xr-x | tests/tests/gitattributes | 5 |
1 files 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 |