X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=118c497115e9f1ac96198a6c7b392653215cc394;hp=7cd8062cae3c7d1b6671832bce1197a9d35a587a;hb=5ecff56dbf1b60b6b5c814b3450bf4ec37ed26d6;hpb=5339e3c5dcc53b10ea981c106ad7211b5a701ee1 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 () {