Testsuite: munge for non-dkim

diff --git a/test/runtest b/test/runtest
index b479238692199e2e56c163fd492e80538d3d32b1..27027bda91ecaa816ebded73cba91927255439c6 100755 (executable)
--- 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 ce15ccd7aea62524f05c2583501d585ba3faa54c..50cfd488007355f626a65515febf3c59c1d6f88f 100644 (file)
--- 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 43903aa79ac5c85d63100cacde5b4f1b203b145d..dd25241b27185f7a5987904de08e8d93ddeb1abd 100644 (file)
--- 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 b2b9792970adac9ea52608a8fef9e3b182a2f345..a09e869949a24e1efb0a8f173b851cbbb922e128 100644 (file)
--- 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}