test suite: gitattributes: Break out sums_check_broken

[dgit.git] / tests / tests / gitattributes

diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index e6089bd9cdda9007c597a7e2c9728cf9a3e90d48..83fa6102ef430f7ecc2a3899fac68e6ddeef484a 100755 (executable)
--- a/tests/tests/gitattributes
+++ b/tests/tests/gitattributes
@@ -121,23 +121,11 @@ sums_check () {
        diff -U0 ../sums ../$sums
 }
 
-sfmt_import () {
-       inst=$1
-       dgitargs=$2
-       branch="import.$sfmt-$inst"
-       brkerr=stderr.$sfmt-$inst.broken
-       dscf=${p}_${v}.dsc
-       sums=sums.$sfmt-$inst
-
-       mkdir $pdb-import-$inst
-       cd $pdb-import-$inst
-       git init
+sums_check_broken () {
+       # caller should cd into working directory, set
+       #   $sums
+       # and check out the broken branch
 
-       LC_MESSAGES=C \
-       t-dgit $dgitargs import-dsc ../$dscf +$branch.broken \
-               2>&1 |tee ../$brkerr
-       fgrep 'warning: source tree contains .gitattributes' ../$brkerr
-       git checkout $branch.broken
        sha256sum af/* >../$sums.broken
 
        for s in ../sums ../$sums.broken; do
@@ -149,10 +137,46 @@ sfmt_import () {
        rc=$?
        set -e
        test $rc = 1
+}
+
+t-dgit-warn-check () {
+       local warnok=$1; shift
+       # warnok should be  0 if the warning is expected
+       #                   1 if the warning is NOT expected
+
+       local err=stderr.$wd
+
+       LC_MESSAGES=C t-dgit "$@" 2>&1 |tee ../$err
+
+       set +e
+       fgrep 'warning: source tree contains .gitattributes' ../$err
+       rc=$?
+       set -e
+
+       test "$rc" = "$warnok"
+}
+
+sfmt_import () {
+       inst=$1
+       dgitargs=$2
+       branch="import.$sfmt-$inst"
+       dscf=${p}_${v}.dsc
+       sums=sums.$sfmt-$inst
+       wd=$pdb-import-$inst
+
+       mkdir $wd
+       cd $wd
+       git init
+
+       t-dgit-warn-check 0 $dgitargs import-dsc ../$dscf +$branch.broken
+
+       git checkout $branch.broken
+
+       sums_check_broken
 
        t-dgit setup-new-tree
 
-       t-dgit $dgitargs import-dsc ../$dscf +$branch
+       t-dgit-warn-check 1 $dgitargs import-dsc ../$dscf +$branch
        git checkout $branch
        git reset --hard