summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-15 22:50:03 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2017-01-16 01:25:19 +0000
commitaacc377731b9fd2a635808b65462a93810759e4d (patch)
tree7e6334bbf26cb9a82e8609df0fd0d3c3de529903
parent8d2e5d2192aeee25890376bbcae68cdef891ff5a (diff)
test suite: gitattributes: Check for expected warnings
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rwxr-xr-xtests/tests/gitattributes6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index 7b0818a..2e24bba 100755
--- a/tests/tests/gitattributes
+++ b/tests/tests/gitattributes
@@ -96,12 +96,16 @@ sfmt_import () {
inst=$1
dgitargs=$2
refname="import.$sfmt-$inst"
+ brkerr=stderr.$sfmt-$inst.broken
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 ../${p}_${v}.dsc +$refname.broken \
+ 2>&1 |tee ../$brkerr
+ fgrep 'warning: source tree contains .gitattributes' ../$brkerr
git checkout $refname.broken
sha256sum af/* >../$sums.broken