From: Jacob Bachmeyer <jcb@gnu.org>
Date: Tue, 22 Nov 2022 04:16:32 +0000 (-0600)
Subject: Remove testsuite logic that supported email outside of report phase
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1dba9c13d1fe7da661dbab884504da9a3f0d993c;p=gatekeeper.git

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 1313e1b..8d78a64 100644
--- 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