Testsuite: munge for EXPERIMENTAL_DSN_INFO

Broken-by: e2fe20104068

diff --git a/test/mail/0032.CALLER b/test/mail/0032.CALLER
index b37b412ee283fc7943125a8564447265c90156c2..7065137b8b37d5b739147c20ae0f75ba80c07a73 100644 (file)
--- 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 0ac821a59120aa760d4f64cc93ce33ceca17f2a3..c0348c45709efdb2a2fe1886898792a43ef6e2a6 100644 (file)
--- 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 e966d88b53fa0b5c3ba1845645abee1a387cf7d1..b51ae1bc6edc26235cf19b90f125fa50748ff739 100644 (file)
--- 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 fc117ebda4415d7ba275433cc3333cb50f9792ad..6c1d4b8c17bfdca4ad7b3a844d786d7a21a7ecb8 100644 (file)
--- 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 b97fc622130dfb75c9a9771290c1d27d5891e182..0a0f10801324be81af674fba082740ae5f656189 100644 (file)
--- 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 c63bcb0b171dbf746c3a60e0fb63f662b46a86da..ad62b017ab3cced5da13ea8acee33113435be186 100644 (file)
--- 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 3f4667a8b160b4fd5abef29edea15c38854fbc46..087962bf18e29b7bbadd0f1db30cfd9b7de33618 100644 (file)
--- 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 594155c7d93a8d5954e9e73e7996543d9e4acad2..5f03e6221b6405d25e06d9ed854ab027e586279c 100644 (file)
--- 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 05dc46130f285d47369afd62bc576076b326ce0c..422549f6268e54d4031d2b3099ffa5a6a3307eab 100644 (file)
--- 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 d3d91c279a85b9385596a0ffd7652b61f8e811e5..67e5f59f5bba4efda073b7ee3d40e3c3b6fa3959 100644 (file)
--- 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 d3d91c279a85b9385596a0ffd7652b61f8e811e5..67e5f59f5bba4efda073b7ee3d40e3c3b6fa3959 100644 (file)
--- 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 36157c8355abe814caa934a594cc33d7ff537421..c4f2a9509d67fc5d913701f9db377b9a70935370 100644 (file)
--- 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 825cd3f01d220659a65f23de90f34a4a2480889b..53051819260ffed50eccd003c1e6a79c4f04442e 100644 (file)
--- 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 32bb774c0e771f6a0dad7877770616cf5c6ca610..80b2afb55f534802c8f622254e146f4c649c5d64 100644 (file)
--- 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 0c164167f0c4ac636fe96dda1a4444d24d01ccf7..48d3e98c6e70dd4bdf911039833b6db427a5edf2 100644 (file)
--- 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 9e53c20b19ae97310fd68f55c908fd1742c12019..9635c7dc6d3175fd544729a92b83384cc53ae466 100644 (file)
--- 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 e0f8cc8b3034e34b6a09b392b550ce1824f9a4ba..dd40c616efd10be29be8b63ffc1aef0d073946b6 100644 (file)
--- 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 cb050b1224634d9ac4d26ffac0ffe9a718bfa4d0..c1c378181674e2c0cdb28bbf0f04bffc30b85f50 100644 (file)
--- 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 edaec6b2525565397dd4e776c3540de5916828aa..ef202985abefd5d212cec6b1633b7ed0eeb6f912 100755 (executable)
--- 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 9d3ba87518d61a3d417599d09768de7a6f0ab936..2e2a3f63355b3cd36e45276d772745eee007ada3 100644 (file)
--- 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