test suite: gitattributes: Break out origtar= setting

[dgit.git] / tests / tests / gitattributes

diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index 7b0818a0cf9177d5cc6f9fbe063b2372d272d102..fcbe313b623d7a8b1cde10f648bb7a20ce86c493 100755 (executable)
--- a/tests/tests/gitattributes
+++ b/tests/tests/gitattributes
@@ -3,6 +3,7 @@ set -e
 . tests/lib
 
 t-dependencies bsdgames
+t-dependencies man-db git-man
 t-tstunt-parsechangelog
 
 t-archive-none example
@@ -56,6 +57,15 @@ badattr export-subst
 badattr delta
 badattr encoding no-such-encoding
 
+man gitattributes \
+| perl -ne 'print $1,"\n" if m/^ *(\w[-a-z]*)$/' \
+> grepped-attrs
+
+exec <grepped-attrs
+while read attr; do
+       badattr $attr
+done
+
 sha256sum af/* >sums
 
 # ----- common to source formats -----
@@ -96,12 +106,17 @@ sfmt_import () {
        inst=$1
        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
 
-       t-dgit $dgitargs import-dsc ../${p}_${v}.dsc +$refname.broken
+       LC_MESSAGES=C \
+       t-dgit $dgitargs import-dsc ../$dscf +$refname.broken \
+               2>&1 |tee ../$brkerr
+       fgrep 'warning: source tree contains .gitattributes' ../$brkerr
        git checkout $refname.broken
        sha256sum af/* >../$sums.broken
 
@@ -117,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
@@ -135,7 +150,9 @@ sfmt_import () {
 
 : ----- generate the orig -----
 
-tar --exclude=debian --exclude=.git -zcf ${p}_${bv}.orig.tar.gz $p
+origtar=${p}_${bv}.orig.tar.gz
+
+tar --exclude=debian --exclude=.git -zcf $origtar $p
 
 : ----- test 1.0 native -----
 
@@ -153,7 +170,7 @@ diff_convert () { :; }
 sfmt_setup 1.1 diff
 sfmt_import norm
 
-: ----- test "3.0 (quilt)"
+: ----- test "3.0 (quilt)" -----
 
 quilt_addpatch () {
        pname=$1