DKIM: support list-version of $dkim_verify_status, and data ACL

[exim.git] / test / runtest

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/;
 
     # 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 ========
     }
 
   # ======== stderr ========


@@ -1631,6 +1640,15 @@ RESET_AFTER_EXTRA_LINE_READ:
       <IN>;
       <IN>;
       }
       <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 ========
     }
 
   # ======== All files other than stderr ========