Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0563

diff --git a/test/stderr/0563 b/test/stderr/0563
index dbbe4e08d2a8bc0ecc9fe522b41248768addcac0..8ce12a2e5c417fd9bc6af254a3e851aec1e2e0a4 100644 (file)
--- a/test/stderr/0563
+++ b/test/stderr/0563
@@ -1,11 +1,12 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 changed uid/gid: forcing real = effective
 changed uid/gid: forcing real = effective

-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1234

 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed

-  uid=EXIM_UID gid=EXIM_GID pid=pppp
-originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=Exim Test Suite
+  uid=EXIM_UID gid=EXIM_GID pid=p1234
+originator: uid=CALLER_UID gid=CALLER_GID login=CALLER name=CALLER_GECOS

 sender address = CALLER@testexim.test.ex
 Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 sender address = CALLER@testexim.test.ex
 Verifying: uid=EXIM_UID gid=EXIM_GID euid=EXIM_UID egid=EXIM_GID
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>


@@ -17,15 +18,29 @@ routing joe-real@testexim.test.ex
 --------> router1 router <--------
 local_part=joe-real domain=testexim.test.ex
 checking local_parts
 --------> router1 router <--------
 local_part=joe-real domain=testexim.test.ex
 checking local_parts

-joe-real in "joe:sam:tom"? no (end of list)
-joe-real in "+aliases"? no (end of list)
+joe-real in local_parts?
+ list element: +aliases
+  start sublist aliases
+   joe-real in "joe:sam:tom"?
+   ╎list element: joe
+   ╎list element: sam
+   ╎list element: tom
+   joe-real in "joe:sam:tom"? no (end of list)
+  end sublist aliases
+joe-real in local_parts? no (end of list)

 router1 router skipped: local_parts mismatch
 --------> router2 router <--------
 local_part=joe-real domain=testexim.test.ex
 stripped suffix -real
 checking local_parts
 router1 router skipped: local_parts mismatch
 --------> router2 router <--------
 local_part=joe-real domain=testexim.test.ex
 stripped suffix -real
 checking local_parts

-joe in "joe:sam:tom"? yes (matched "joe")
-joe in "+aliases"? yes (matched "+aliases")
+joe in local_parts?
+ list element: +aliases
+  start sublist aliases
+   joe in "joe:sam:tom"?
+   ╎list element: joe
+   ╎joe in "joe:sam:tom"? yes (matched "joe")
+  end sublist aliases
+ joe in local_parts? yes (matched "+aliases")

 calling router2 router
 router2 router called for joe-real@testexim.test.ex
   domain = testexim.test.ex
 calling router2 router
 router2 router called for joe-real@testexim.test.ex
   domain = testexim.test.ex


@@ -33,9 +48,9 @@ set transport local_delivery
 queued for local_delivery transport: local_part = joe
 domain = testexim.test.ex
   errors_to=NULL
 queued for local_delivery transport: local_part = joe
 domain = testexim.test.ex
   errors_to=NULL

-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=joe

 routed by router2 router
   envelope to: joe-real@testexim.test.ex
   transport: local_delivery
 search_tidyup called
 routed by router2 router
   envelope to: joe-real@testexim.test.ex
   transport: local_delivery
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>