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 <ijackson@chiark.greenend.org.uk>

diff --git a/tests/tests/tagupl b/tests/tests/tagupl
index 0f6ff982d54ebb8492b200a33ee795bb80eba2fb..f7ed6e6b4defc61c7f466b08053b3e1b9f8e3dd6 100755 (executable)
--- 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 () {