From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 15 Jan 2017 22:50:03 +0000 (+0000)
Subject: test suite: gitattributes: Check for expected warnings
X-Git-Tag: archive/debian/3.3~5
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=aacc377731b9fd2a635808b65462a93810759e4d;p=dgit.git

test suite: gitattributes: Check for expected warnings

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/tests/gitattributes b/tests/tests/gitattributes
index 7b0818a0..2e24bba3 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