Testsuite: munge for non-WITH_CONTENT_SCAN builds

diff --git a/test/runtest b/test/runtest
index 68b73d62d37ce21cbf157c46586ef71f488f3563..6951536f79c20d544d6e4b39e67cf0298b30cce4 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -1407,7 +1407,7 @@ RESET_AFTER_EXTRA_LINE_READ:
     s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;
 
     # CONTENT_SCAN
     s%(?<!lsearch)[^ ](?=TESTSUITE/aux-fixed/(?:0414.list[12]|0464.domains)$)%0%;
 
     # CONTENT_SCAN

-    next if /try option acl_not_smtp_mime$/;
+    next if /try option acl_(?:not_)?smtp_mime$/;

 
     # DISABLE_OCSP
     next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;
 
     # DISABLE_OCSP
     next if /in hosts_requ(est|ire)_ocsp\? (no|yes)/;

diff --git a/test/stderr/0632 b/test/stderr/0632
index 69337158362e31d98d484c5f6a76da98b9e90e50..a01ed1b66e00f37a6d62303a7c6049dbf9b2e755 100644 (file)
--- a/test/stderr/0632
+++ b/test/stderr/0632
@@ -488,7 +488,6 @@ p1235  ␉id░10HmaX-000000005vi-0000↩
 p1235  ␉for░dest_1@test.ex
 p1235             ╰──(tainted)
 p1235 try option acl_smtp_dkim
 p1235  ␉for░dest_1@test.ex
 p1235             ╰──(tainted)
 p1235 try option acl_smtp_dkim

-p1235 try option acl_smtp_mime

 p1235 try option acl_smtp_data
 p1235  ╭considering: ${tod_full}
 p1235  ├───expanded: ${tod_full}
 p1235 try option acl_smtp_data
 p1235  ╭considering: ${tod_full}
 p1235  ├───expanded: ${tod_full}


@@ -954,7 +953,6 @@ p1236  ␉id░10HmaY-000000005vi-0000↩
 p1236  ␉for░dest_2@test.ex
 p1236             ╰──(tainted)
 p1236 try option acl_smtp_dkim
 p1236  ␉for░dest_2@test.ex
 p1236             ╰──(tainted)
 p1236 try option acl_smtp_dkim

-p1236 try option acl_smtp_mime

 p1236 try option acl_smtp_data
 p1236  ╭considering: ${tod_full}
 p1236  ├───expanded: ${tod_full}
 p1236 try option acl_smtp_data
 p1236  ╭considering: ${tod_full}
 p1236  ├───expanded: ${tod_full}