DMARC: expand main-config options. Bug 3102

[exim.git] / test / stderr / 0628

diff --git a/test/stderr/0628 b/test/stderr/0628
index 21921848400c767a9d59e66f37250457821a1dfa..7b1459f1b8bd76c86f83216984d6908972f8beb1 100644 (file)
--- a/test/stderr/0628
+++ b/test/stderr/0628
@@ -1,7 +1,7 @@
-01:01:01 p1237  warn: condition test succeeded in ACL "chk_data"
-01:01:01 p1237  processing "accept" (TESTSUITE/test-config 28)
-01:01:01 p1237  accept: condition test succeeded in ACL "chk_data"
-01:01:01 p1237  end of ACL "chk_data": ACCEPT
+01:01:01 p1237  warn: condition test succeeded in ACL chk_data
+01:01:01 p1237  processing ACL chk_data "accept" (TESTSUITE/test-config 28)
+01:01:01 p1237  accept: condition test succeeded in ACL chk_data
+01:01:01 p1237  end of ACL chk_data: ACCEPT
 01:01:01 p1237   ╭considering: ${tod_full}
 01:01:01 p1237   ├───expanded: ${tod_full}
 01:01:01 p1237   ╰─────result: Tue,░2░Mar░1999░09:44:33░+0000
@@ -53,9 +53,6 @@
 01:01:01 p1239  DSN: set orcpt:   flags: 0x0
 01:01:01 p1239  Delivery address list:
 01:01:01 p1239    dest@test.ex 
-01:01:01 p1239   EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
-01:01:01 p1239   returned from EXIM_DBOPEN: (nil)
-01:01:01 p1239   failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 01:01:01 p1239  no retry data available
 01:01:01 p1239  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1239  Considering: dest@test.ex
@@ -115,10 +112,10 @@
 01:01:01 p1237  SMTP>>(close on process exit)
 01:01:01 p1237  >>>>>>>>>>>>>>>> Exim pid=p1237 (daemon-accept) terminating with rc=0 >>>>>>>>>>>>>>>>
 01:01:01 p1240  check control = queue_only
-01:01:01 p1240  warn: condition test succeeded in ACL "chk_data"
-01:01:01 p1240  processing "accept" (TESTSUITE/test-config 28)
-01:01:01 p1240  accept: condition test succeeded in ACL "chk_data"
-01:01:01 p1240  end of ACL "chk_data": ACCEPT
+01:01:01 p1240  warn: condition test succeeded in ACL chk_data
+01:01:01 p1240  processing ACL chk_data "accept" (TESTSUITE/test-config 28)
+01:01:01 p1240  accept: condition test succeeded in ACL chk_data
+01:01:01 p1240  end of ACL chk_data: ACCEPT
 01:01:01 p1240   ╭considering: ${tod_full}
 01:01:01 p1240   ├───expanded: ${tod_full}
 01:01:01 p1240   ╰─────result: Tue,░2░Mar░1999░09:44:33░+0000
@@ -158,9 +155,6 @@
 01:01:01 p1241  DSN: set orcpt:   flags: 0x0
 01:01:01 p1241  Delivery address list:
 01:01:01 p1241    dest2@test.ex 
-01:01:01 p1241   EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
-01:01:01 p1241   returned from EXIM_DBOPEN: (nil)
-01:01:01 p1241   failed to open DB file TESTSUITE/spool/db/retry: No such file or directory
 01:01:01 p1241  no retry data available
 01:01:01 p1241  >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 01:01:01 p1241  Considering: dest2@test.ex