Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0275

diff --git a/test/stderr/0275 b/test/stderr/0275
index 7016b59740eaec1f7687fba71dd5dd7a922df358..aa6187d0d2a595b9cc2efc8b3b2a10d576cce933 100644 (file)
--- a/test/stderr/0275
+++ b/test/stderr/0275
@@ -259,9 +259,6 @@ body_linecount=0 message_linecount=8
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 
 DSN: set orcpt:   flags: 0x0
 Delivery address list:
   userx@test.ex 

- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory

 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex
 no retry data available
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Considering: userx@test.ex


@@ -285,8 +282,9 @@ test.ex in hold_domains?
  cached no match for +hold_domains
 test.ex in hold_domains? no (end of list)
 unique = userx@test.ex
  cached no match for +hold_domains
 test.ex in hold_domains? no (end of list)
 unique = userx@test.ex

-no   domain  retry record
-no   address retry record
+checking router retry status
+ no   domain  retry record
+ no   address retry record

 userx@test.ex: queued for routing
 test.ex in queue_domains?
  list element: !+not_queue_domains
 userx@test.ex: queued for routing
 test.ex in queue_domains?
  list element: !+not_queue_domains


@@ -458,9 +456,6 @@ After routing:
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 search_tidyup called
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------

- EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
- returned from EXIM_DBOPEN: (nil)
- failed to open DB file TESTSUITE/spool/db/retry: No such file or directory

 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to userx <userx@test.ex> transport=t1
 no retry data available
 search_tidyup called
 changed uid/gid: local delivery to userx <userx@test.ex> transport=t1


@@ -487,10 +482,10 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=p1236
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items
   uid=EXIM_UID gid=EXIM_GID pid=p1236
 set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000
 Processing retry items

-Succeeded addresses:
- userx@test.ex: no retry items
-Failed addresses:
-Deferred addresses:
+ Succeeded addresses:
+  userx@test.ex: no retry items
+ Failed addresses:
+ Deferred addresses:

 end of retry processing
 DSN: processing router : r3
 DSN: processing successful delivery address: userx@test.ex
 end of retry processing
 DSN: processing router : r3
 DSN: processing successful delivery address: userx@test.ex