From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 11 Jul 2015 12:41:57 +0000 (+0100)
Subject: Test suite: Break out t-grep-mpat (nfc)
X-Git-Tag: debian/1.0~46
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=5ecff56dbf1b60b6b5c814b3450bf4ec37ed26d6;ds=sidebyside

Test suite: Break out t-grep-mpat (nfc)
---

diff --git a/tests/lib b/tests/lib
index 7cd8062c..118c4971 100644
--- a/tests/lib
+++ b/tests/lib
@@ -58,6 +58,13 @@ t-expect-fail () {
 	*)	fail "tee failed"  ;;
 	esac
 
+	t-grep-mpat "$mpat" $tmp/t.output
+}
+
+t-grep-mpat () {
+	local mpat="$1"
+	local file="$2"
+
 	local grepper=fgrep
 	case "$mpat" in
 	[A-Z]:*)
@@ -70,8 +77,8 @@ t-expect-fail () {
 		;;
 	esac
 
-	$grepper -e "$mpat" $tmp/t.output ||
-		fail "error message not found"
+	$grepper -e "$mpat" "$file" ||
+		fail "message not found"
 }
 
 t-expect-push-fail () {