Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0399

diff --git a/test/stderr/0399 b/test/stderr/0399
index 2dc717282e73a9fc2fcf98917f60d4392d7fca4b..cbcfb336b05f54d1b3d47d5eaf504e97417d43de 100644 (file)
--- a/test/stderr/0399
+++ b/test/stderr/0399
@@ -1,6 +1,7 @@
 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
 dropping to exim gid; retaining priv uid
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid


@@ -16,8 +17,8 @@ routing x@y
 --------> r1 router <--------
 local_part=x domain=y
 calling r1 router
 --------> r1 router <--------
 local_part=x domain=y
 calling r1 router

-rda_interpret (string): 
-expanded: 
+rda_interpret (string): ''
+expanded: ''

 file is not a filter file
 parse_forward_list: 
 r1 router declined for x@y
 file is not a filter file
 parse_forward_list: 
 r1 router declined for x@y


@@ -25,8 +26,8 @@ expansion of "more" forced failure
 --------> r2 router <--------
 local_part=x domain=y
 calling r2 router
 --------> r2 router <--------
 local_part=x domain=y
 calling r2 router

-rda_interpret (string): 
-expanded: 
+rda_interpret (string): ''
+expanded: ''

 file is not a filter file
 parse_forward_list: 
 r2 router declined for x@y
 file is not a filter file
 parse_forward_list: 
 r2 router declined for x@y


@@ -34,11 +35,11 @@ expansion of "more" yields "yes"
 --------> r3 router <--------
 local_part=x domain=y
 calling r3 router
 --------> r3 router <--------
 local_part=x domain=y
 calling r3 router

-rda_interpret (string): 
-expanded: 
+rda_interpret (string): ''
+expanded: ''

 file is not a filter file
 parse_forward_list: 
 r3 router declined for x@y
 failed to expand "more" in r3 router: unknown variable name "unknown_variable"
 search_tidyup called
 file is not a filter file
 parse_forward_list: 
 r3 router declined for x@y
 failed to expand "more" in r3 router: unknown variable name "unknown_variable"
 search_tidyup called

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