Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 1006

diff --git a/test/stderr/1006 b/test/stderr/1006
index 0cb661df95e915b4035fe092ed482b9c81cec64d..ef5f0b89fbb5e8b412815ba019f663d129ac700b 100644 (file)
--- a/test/stderr/1006
+++ b/test/stderr/1006
@@ -1,86 +1,52 @@
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-DNS lookup of mx46.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of mx46.test.ex (MX) succeeded
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
+ DNS lookup of mx46.test.ex (MX) using fakens
+ DNS lookup of mx46.test.ex (MX) succeeded
+ DNS lookup of 46.test.ex (AAAA) succeeded
+ DNS lookup of 46.test.ex (A) using fakens
+ DNS lookup of 46.test.ex (A) succeeded
+manualroute in local_parts? no (end of list)
 DNS lookup of 46.test.ex (AAAA) succeeded
 DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of 46.test.ex (A) succeeded
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of 46.test.ex (AAAA) succeeded
-DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of 46.test.ex (A) succeeded
-DNS lookup of v6.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of v6.test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of v6.test.ex (AAAA) succeeded
-DNS lookup of v6.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of v6.test.ex (A) gave NO_DATA
-returning DNS_NODATA
-faking res_search(A) response length as 65535
- writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
+ DNS lookup of v6.test.ex (MX) using fakens
+ DNS lookup of v6.test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
+ DNS lookup of v6.test.ex (AAAA) succeeded
+ DNS lookup of v6.test.ex (A) using fakens
+ DNS lookup of v6.test.ex (A) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(A) response length as 65535
+  writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+Hints DB:
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
-DNS lookup of mx46.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of mx46.test.ex (MX) succeeded
-DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of 46.test.ex (A) succeeded
+ DNS lookup of mx46.test.ex (MX) using fakens
+ DNS lookup of mx46.test.ex (MX) succeeded
+ DNS lookup of 46.test.ex (A) using fakens
+ DNS lookup of 46.test.ex (A) succeeded
+manualroute in local_parts? no (end of list)
 DNS lookup of 46.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of 46.test.ex (A) succeeded
-DNS lookup of v6.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of v6.test.ex (MX) gave NO_DATA
-returning DNS_NODATA
-faking res_search(MX) response length as 65535
- writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
-DNS lookup of v6.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
-DNS lookup of v6.test.ex (A) gave NO_DATA
-returning DNS_NODATA
-faking res_search(A) response length as 65535
- writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
+ DNS lookup of v6.test.ex (MX) using fakens
+ DNS lookup of v6.test.ex (MX) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(MX) response length as 65535
+  writing neg-cache entry for v6.test.ex-MX-xxxx, ttl 3000
+ DNS lookup of v6.test.ex (A) using fakens
+ DNS lookup of v6.test.ex (A) gave NO_DATA
+ returning DNS_NODATA
+ faking res_search(A) response length as 65535
+  writing neg-cache entry for v6.test.ex-A-xxxx, ttl 3000
+dnslookup in local_parts? no (end of list)
+>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=2 >>>>>>>>>>>>>>>>
 
 ******** SERVER ********