From: Ian Jackson Date: Fri, 19 Jul 2019 21:19:31 +0000 (+0100) Subject: test suite: tag-to-upload tests: Make message checks regexps X-Git-Tag: archive/debian/9.4~6 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=6b96b8bee08aad471f89b9290d8972ba9fc7effb test suite: tag-to-upload tests: Make message checks regexps No functional change yet. All the existing message strings are already equivalently valid when interpreted by egrep. Signed-off-by: Ian Jackson --- diff --git a/tests/tests/tagupl b/tests/tests/tagupl index 0f6ff982..f7ed6e6b 100755 --- a/tests/tests/tagupl +++ b/tests/tests/tagupl @@ -72,19 +72,19 @@ with-mangled () { expect-quit () { next-mangle "$1" local perl=$2 - local mstring=$3 + local mregexp=$3 with-mangled "$perl" - grep ": $mstring" ../tagupl/overall.log + egrep ": $mregexp" ../tagupl/overall.log } expect-email () { next-mangle "$1" local perl=$2 - local mstring=$3 + local mregexp=$3 with-mangled "$perl" - grep 'Was not successful' ../sendmail.log - grep "$mstring" ../sendmail.log - grep ": failed, emailed" ../tagupl/overall.log + egrep 'Was not successful' ../sendmail.log + egrep "$mregexp" ../sendmail.log + egrep ": failed, emailed" ../tagupl/overall.log } raw-mangled () {