From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Thu, 16 May 2024 11:42:00 +0000 (+0100)
Subject: Testsuite: munge for non-dkim
X-Git-Tag: exim-4.98-RC0~16
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/359e2110201a7d6f9c5db33f4f9be4380b3cce25?ds=inline

Testsuite: munge for non-dkim
---

diff --git a/test/runtest b/test/runtest
index b47923869..27027bda9 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1288,8 +1288,9 @@ RESET_AFTER_EXTRA_LINE_READ:
       if (/looked up these IP addresses/);
     next if /name=localhost address=::1/;
 
-    # drop pdkim debugging header
+    # DKIM: Not all builds include
     next if /^DKIM( <<<<<<<<<<<<<<<<<<<<<<<<<<<<<+|: no signatures)$/;
+    next if /try option acl_smtp_dkim$/;
 
     # Some platforms have TIOCOUT, some do not
     next if /\d+ bytes remain in socket output buffer$/;
diff --git a/test/stderr/0632 b/test/stderr/0632
index ce15ccd7a..50cfd4880 100644
--- a/test/stderr/0632
+++ b/test/stderr/0632
@@ -489,7 +489,6 @@ p1235  ␉(envelope-from░<CALLER@test.ex>)↩
 p1235  ␉id░10HmaX-000000005vi-0000↩
 p1235  ␉for░dest_1@test.ex
 p1235             ╰──(tainted)
-p1235 try option acl_smtp_dkim
 p1235 try option acl_smtp_data
 p1235  ╭considering: ${tod_full}
 p1235  ├───expanded: ${tod_full}
@@ -956,7 +955,6 @@ p1236  ␉(envelope-from░<CALLER@test.ex>)↩
 p1236  ␉id░10HmaY-000000005vi-0000↩
 p1236  ␉for░dest_2@test.ex
 p1236             ╰──(tainted)
-p1236 try option acl_smtp_dkim
 p1236 try option acl_smtp_data
 p1236  ╭considering: ${tod_full}
 p1236  ├───expanded: ${tod_full}
diff --git a/test/stderr/5410 b/test/stderr/5410
index 43903aa79..dd25241b2 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -635,7 +635,6 @@ try option received_header_text
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
-try option acl_smtp_dkim
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}
@@ -1244,7 +1243,6 @@ try option received_header_text
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
-try option acl_smtp_dkim
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}
@@ -1853,7 +1851,6 @@ try option received_header_text
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
-try option acl_smtp_dkim
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}
diff --git a/test/stderr/5420 b/test/stderr/5420
index b2b979297..a09e86994 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -635,7 +635,6 @@ try option received_header_text
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
-try option acl_smtp_dkim
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}
@@ -1244,7 +1243,6 @@ try option received_header_text
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
-try option acl_smtp_dkim
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}
@@ -1853,7 +1851,6 @@ try option received_header_text
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
-try option acl_smtp_dkim
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}