Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0426

diff --git a/test/stderr/0426 b/test/stderr/0426
index 23080e96d89f52f1c973be469c726c8165a59e37..b9ab6329f197accd922845ed43dcf74a7974666e 100644 (file)
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -1,15 +1,16 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: x@uppercase.test.ex
@@ -20,16 +21,21 @@ routing x@uppercase.test.ex
 --------> r0 router <--------
 local_part=x domain=uppercase.test.ex
 checking senders
+test.ex in ""? no (end of list)
+CALLER@test.ex in senders? no (end of list)
 r0 router skipped: senders mismatch
 --------> r1 router <--------
 local_part=x domain=uppercase.test.ex
 calling r1 router
 r1 router called for x@uppercase.test.ex
   domain = uppercase.test.ex
-uppercase.test.ex (MX resp) DNSSEC
+main lookup for domain
+ check dnssec require list
+ check dnssec request list
+ uppercase.test.ex (MX resp) DNSSEC
 local host found for non-MX address
-fully qualified name = UpperCase.test.ex
-uppercase.test.ex 127.0.0.1 mx=-1 sort=xx 
+ fully qualified name = UpperCase.test.ex
+ uppercase.test.ex 127.0.0.1 mx=-1 sort=xx 
 remote host address is the local host: uppercase.test.ex: configured to try delivery anyway
 set transport t1
 queued for t1 transport: local_part = x
@@ -47,23 +53,23 @@ After routing:
     x@UpperCase.test.ex
   Failed addresses:
   Deferred addresses:
-locking TESTSUITE/spool/db/retry.lockfile
-locking TESTSUITE/spool/db/wait-t1.lockfile
-cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT:250'
+cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT+:250'
+>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
-  <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
+  <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 dropping to exim gid; retaining priv uid
-locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: CALLER@test.ex
@@ -91,9 +97,9 @@ After routing:
   Deferred addresses:
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1238 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1237 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   Completed
->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>