Remove testsuite logic that supported email outside of report phase

All email messages are now sent during the report phase.

diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp
index 1313e1b651368e4967cd63cdf3e55fe36bf0504c..8d78a640aa8946954aacf7d37e6dbb066791dd1e 100644 (file)
--- a/testsuite/lib/gatekeeper.exp
+++ b/testsuite/lib/gatekeeper.exp
@@ -856,35 +856,35 @@ proc analyze_log { base_dir name assess } {
                     exp_continue
                 }
 
-       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\
                 No uploader e-mail address\(es\) to report this error to!} {
                     # from mail, when no email address is provided
                     set A(mail,no-known-address) 1
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\
                 NOMAIL is set - not sending email to [^\r\n]+} {
                     # from mail, when mail is inhibited
                     set A(mail,inhibited) 1
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\
                 Sending email to [^\r\n]+} {
                     # from mail, recording address list
                     set A(mail,addresses) 1
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\
                 Subject: [^\r\n]+} {
                     # from mail, outgoing Subject line
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\
                 Error uploading package: [^\r\n]+} {
                     # from mail, when a generic failure is reported
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[(?:RP|EX|AA|PV)\]\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\) \[RP\]\
                 Body: [^\r\n]+} {
                     # from mail, recording outgoing message body
                     exp_continue