Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 4802

diff --git a/test/stderr/4802 b/test/stderr/4802
index 85a2b1ca040080125d0fbdb24de4e7237308f07e..72a915d0b79059e81d52bee1ae0e9b36d3b39c58 100644 (file)
--- a/test/stderr/4802
+++ b/test/stderr/4802
@@ -1,38 +1,22 @@
 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 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

-DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-DNS lookup of a-aa.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-DNS lookup of a-aa.test.ex (A) succeeded
+ DNS lookup of mx-sec-a-aa.test.ex (MX) using fakens
+ DNS lookup of mx-sec-a-aa.test.ex (MX) succeeded
+ DNS lookup of a-aa.test.ex (A) using fakens
+ DNS lookup of a-aa.test.ex (A) succeeded

 DNS lookup of a-aa.test.ex (A/AAAA) requested AD, but got AA
 DNS lookup of a-aa.test.ex (A/AAAA) requested AD, but got AA

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

 Exim version x.yz ....
 Exim version x.yz ....

+Hints DB:

 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

-DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
-DNS lookup of mx-aa-a-sec.test.ex (MX) requested AD, but got AA
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-DNS lookup of a-sec.test.ex (A) using fakens
-fresh-exec forking for child-open
-postfork: child-open
-fresh-exec forked for child-open: npppp
-DNS lookup of a-sec.test.ex (A) succeeded
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+ DNS lookup of mx-aa-a-sec.test.ex (MX) using fakens
+ DNS lookup of mx-aa-a-sec.test.ex (MX) succeeded
+ DNS lookup of mx-aa-a-sec.test.ex (MX) requested AD, but got AA
+ DNS lookup of a-sec.test.ex (A) using fakens
+ DNS lookup of a-sec.test.ex (A) succeeded
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>