Testsuite: munge for EXPERIMENTAL_DSN_INFO

Broken-by: e2fe20104068

20 files changed, 18 insertions, 35 deletions

diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index b37b412ee..7065137b8 100644
--- a/test/mail/0032.CALLER
+++ b/test/mail/0032.CALLER
@@ -36,7 +36,6 @@ Reporting-MTA: dns; myhost.ex
 Action: failed
 Final-Recipient: rfc822;userx@mxt1.test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; lowest numbered MX record points to local host
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0037.CALLER b/test/mail/0037.CALLER
index 0ac821a59..c0348c457 100644
--- a/test/mail/0037.CALLER
+++ b/test/mail/0037.CALLER
@@ -42,17 +42,14 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; subject was	"should fail this" (filter fail)
 
 Action: failed
 Final-Recipient: rfc822;abcd@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; subject was	"should fail this" (filter fail)
 
 Action: failed
 Final-Recipient: rfc822;usery@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; subject was	"should fail this" (filter fail)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0051.CALLER b/test/mail/0051.CALLER
index e966d88b5..b51ae1bc6 100644
--- a/test/mail/0051.CALLER
+++ b/test/mail/0051.CALLER
@@ -92,7 +92,6 @@ Reporting-MTA: dns; myhost.ex
 Action: failed
 Final-Recipient: rfc822;userx@badbad.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; unrouteable mail domain "badbad.ex" (:fail:)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -205,7 +204,6 @@ Reporting-MTA: dns; myhost.ex
 Action: failed
 Final-Recipient: rfc822;userx@domain2.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; unrouteable mail domain "domain2.ex" (:fail:)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0103.CALLER b/test/mail/0103.CALLER
index fc117ebda..6c1d4b8c1 100644
--- a/test/mail/0103.CALLER
+++ b/test/mail/0103.CALLER
@@ -87,7 +87,6 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;":fail: fail message"@special
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; fail message
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0136.forwarder b/test/mail/0136.forwarder
index b97fc6221..0a0f10801 100644
--- a/test/mail/0136.forwarder
+++ b/test/mail/0136.forwarder
@@ -38,7 +38,6 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;forwarder@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; Address unknown (:fail:)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -97,7 +96,6 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;forwarder@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; Address unknown (:fail:)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: text/rfc822-headers
diff --git a/test/mail/0174.CALLER b/test/mail/0174.CALLER
index c63bcb0b1..ad62b017a 100644
--- a/test/mail/0174.CALLER
+++ b/test/mail/0174.CALLER
@@ -33,7 +33,6 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;userx@non-local.example
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; unrouteable mail domain "non-local.example" (:fail:)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0177.CALLER b/test/mail/0177.CALLER
index 3f4667a8b..087962bf1 100644
--- a/test/mail/0177.CALLER
+++ b/test/mail/0177.CALLER
@@ -33,7 +33,6 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; subject was "fail this" (filter fail)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0296.CALLER b/test/mail/0296.CALLER
index 594155c7d..5f03e6221 100644
--- a/test/mail/0296.CALLER
+++ b/test/mail/0296.CALLER
@@ -33,7 +33,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;failure@myhost.test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; this message is a failure (filter fail)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0298.CALLER b/test/mail/0298.CALLER
index 05dc46130..422549f62 100644
--- a/test/mail/0298.CALLER
+++ b/test/mail/0298.CALLER
@@ -34,9 +34,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;failure1@myhost.test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; This message is being failed and there's a long and
- tortuous
- explanation about is that is being sent back to the user.
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -89,7 +86,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;failure2@myhost.test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; delivery cancelled
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0306.anyone b/test/mail/0306.anyone
index d3d91c279..67e5f59f5 100644
--- a/test/mail/0306.anyone
+++ b/test/mail/0306.anyone
@@ -33,7 +33,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;list1@lists.test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; list1@lists.test.ex is a closed mailing list
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -86,7 +85,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;nonlist@lists.test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; nonlist@lists.test.ex is a closed mailing list
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0307.anyone b/test/mail/0307.anyone
index d3d91c279..67e5f59f5 100644
--- a/test/mail/0307.anyone
+++ b/test/mail/0307.anyone
@@ -33,7 +33,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;list1@lists.test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; list1@lists.test.ex is a closed mailing list
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -86,7 +85,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;nonlist@lists.test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; nonlist@lists.test.ex is a closed mailing list
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0385.CALLER b/test/mail/0385.CALLER
index 36157c835..c4f2a9509 100644
--- a/test/mail/0385.CALLER
+++ b/test/mail/0385.CALLER
@@ -33,7 +33,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; forced failure
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -88,7 +87,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; forced failure
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -146,7 +144,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; forced failure
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -232,7 +229,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; forced failure
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: text/rfc822-headers
diff --git a/test/mail/0461.CALLER b/test/mail/0461.CALLER
index 825cd3f01..530518192 100644
--- a/test/mail/0461.CALLER
+++ b/test/mail/0461.CALLER
@@ -33,8 +33,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; all hosts for 'test.ex' have been failing for a long
- time (and retry time not reached)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -141,8 +139,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;userx@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; all hosts for 'test.ex' have been failing for a long
- time (and retry time not reached)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/0536.oksender b/test/mail/0536.oksender
index 32bb774c0..80b2afb55 100644
--- a/test/mail/0536.oksender
+++ b/test/mail/0536.oksender
@@ -33,7 +33,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;user22@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; 590 5.4.3 Main and extended code
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/4620.CALLER b/test/mail/4620.CALLER
index 0c164167f..48d3e98c6 100644
--- a/test/mail/4620.CALLER
+++ b/test/mail/4620.CALLER
@@ -38,7 +38,6 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;remote_user@remote.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; account disabled
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/4620.fred[ b/test/mail/4620.fred[
index 9e53c20b1..9635c7dc6 100644
--- a/test/mail/4620.fred[
+++ b/test/mail/4620.fred[
@@ -38,7 +38,6 @@ Reporting-MTA: dns; the.local.host.name
 Action: failed
 Final-Recipient: rfc822;remote_user@remote.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; account disabled
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/5101.copied b/test/mail/5101.copied
index e0f8cc8b3..dd40c616e 100644
--- a/test/mail/5101.copied
+++ b/test/mail/5101.copied
@@ -52,7 +52,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;jack@myhost.test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; LMTP error after end of data: 550 Number 2 fails
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
@@ -109,7 +108,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;jack@myhost.test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; LMTP error after end of data: 550 Number 2 fails
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/mail/5204.CALLER b/test/mail/5204.CALLER
index cb050b122..c1c378181 100644
--- a/test/mail/5204.CALLER
+++ b/test/mail/5204.CALLER
@@ -33,7 +33,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;"FAIL cannot route this one (FAIL)"@some.host
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; cannot route this one (FAIL)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822
diff --git a/test/runtest b/test/runtest
index edaec6b25..ef202985a 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1075,6 +1075,15 @@ RESET_AFTER_EXTRA_LINE_READ:
 
     # mailq times change with when the run is done, vs. static-source spoolfiles
     s/\s*\d*[hd](?=   317 [0-9A-Za-z\-]{23} <nobody\@test.ex>)/DDd/;
+
+    # Not all builds include EXPERIMENTAL_DSN_INFO (1 of 2)
+    if (/^X-Exim-Diagnostic:/)
+      {
+      while (<IN>) {
+	last if (/^$/ || !/^\s/);
+        }
+      goto RESET_AFTER_EXTRA_LINE_READ;
+      }
     }
 
   # ======== stderr ========
@@ -1631,6 +1640,15 @@ RESET_AFTER_EXTRA_LINE_READ:
       <IN>;
       <IN>;
       }
+
+    # Not all builds include EXPERIMENTAL_DSN_INFO (2 of 2)
+    if (/^X-Exim-Diagnostic:/)
+      {
+      while (<IN>) {
+	last if (/^$/ || !/^\s/);
+        }
+      goto RESET_AFTER_EXTRA_LINE_READ;
+      }
     }
 
   # ======== All files other than stderr ========
diff --git a/test/stdout/3412 b/test/stdout/3412
index 9d3ba8751..2e2a3f633 100644
--- a/test/stdout/3412
+++ b/test/stdout/3412
@@ -49,7 +49,6 @@ Reporting-MTA: dns; myhost.test.ex
 Action: failed
 Final-Recipient: rfc822;x@test.ex
 Status: 5.0.0
-X-Exim-Diagnostic: X-str; no deliveries made locally
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/rfc822