From 954e7967ad54af3b638d608873833e1fb5b6ea90 Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Tue, 7 May 2024 14:48:54 +0100
Subject: [PATCH] Testsuite: munge for non-WITH_CONTENT_SCAN builds

---
 test/runtest     | 2 +-
 test/stderr/0632 | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/runtest b/test/runtest
index 68b73d62d..6951536f7 100755
--- 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
-    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)/;
diff --git a/test/stderr/0632 b/test/stderr/0632
index 693371583..a01ed1b66 100644
--- 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 try option acl_smtp_mime
 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 try option acl_smtp_mime
 p1236 try option acl_smtp_data
 p1236  ╭considering: ${tod_full}
 p1236  ├───expanded: ${tod_full}
-- 
2.30.2