Add processing phase tag "RP" for report phase

diff --git a/gatekeeper.pl b/gatekeeper.pl
index 82be9f16346e2f40089bebf5e9ff306993a5f430..63339fa2efa91889cc4e3ee22a31c7794265cfdd 100755 (executable)
--- a/gatekeeper.pl
+++ b/gatekeeper.pl
@@ -2459,6 +2459,7 @@ foreach my $packet (@packets) {   # each list element is an array reference
     # do the work
     execute_commands($oplist);
 
+    local $Phase = 'RP';       # temporary;    TODO:  move to after eval {}
     # report success
     if (!$directive_only) {
       success_upload($sig_file, $upload_file, $directive_file);

diff --git a/testsuite/lib/gatekeeper.exp b/testsuite/lib/gatekeeper.exp
index 12d56f38808b866873b47f3ba99a43497034cd3a..f997f50b81193e38b78c12a70c8e438efd3aa21b 100644 (file)
--- a/testsuite/lib/gatekeeper.exp
+++ b/testsuite/lib/gatekeeper.exp
@@ -867,35 +867,35 @@ proc analyze_log { base_dir name assess } {
                     exp_continue
                 }
 
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -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\)\
+       -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\)\
+       -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\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\)(?: \[RP\])?\
                 Subject: [^\r\n]+} {
                     # from mail, outgoing Subject line
                     exp_continue
                 }
-       -re {^gatekeeper\[[0-9]+\]: \(Test\)\
+       -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\)\
+       -re {^gatekeeper\[[0-9]+\]: \(Test\)(?: \[RP\])?\
                 Body: [^\r\n]+} {
                     # from mail, recording outgoing message body
                     exp_continue