Testsuite: munge for non-WITH_CONTENT_SCAN builds

[exim.git] / test / stderr / 0396

diff --git a/test/stderr/0396 b/test/stderr/0396
index e38b8a7f863d3c810a18bba5086f74dbdf6fd136..75b64878a23050b374ec019329b038e4c192521c 100644 (file)
--- a/test/stderr/0396
+++ b/test/stderr/0396
@@ -1,22 +1,6 @@
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -38,10 +22,11 @@ SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 processing "accept" (TESTSUITE/test-config 12)
 check domains = +fail
-list element: +fail
- start sublist fail
-  expansion of "${if eq {x}{y}{}fail}" forced failure: assume not in this list
- end sublist fail
+y in "+fail"?
+ list element: +fail
+  start sublist fail
+   expansion of "${if eq {x}{y}{}fail}" forced failure: assume not in this list
+  end sublist fail
 y in "+fail"? no (end of list)
 accept: condition test failed in inline ACL
 end of inline ACL: implicit DENY
@@ -52,6 +37,6 @@ created log directory TESTSUITE/spool/log
 SMTP<< quit
 SMTP>> 221 the.local.host.name closing connection
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
+  SMTP connection from CALLER D=qqs closed by QUIT
 search_tidyup called
 >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>