Attempt egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 0419

diff --git a/test/stderr/0419 b/test/stderr/0419
index f7a0fbc5f0f4a2c35f212a74223ec95e9ba85c09..28f6784a20a87faed78f81b2913fe0073e533997 100644 (file)
--- a/test/stderr/0419
+++ b/test/stderr/0419
@@ -1,22 +1,7 @@
 Exim version x.yz ....
+Hints DB:
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=p1234
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
-list element: PATH
-list element: EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
-list element: PATH
 configuration file is TESTSUITE/test-config
 admin user
 changed uid/gid: privilege not needed
@@ -33,45 +18,56 @@ routing k@mxt13.test.ex
 --------> dnslookup router <--------
 local_part=k domain=mxt13.test.ex
 checking domains
-list element: ! +local_domains
- start sublist local_domains
-  list element: !mxt13.test.ex
-  mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!mxt13.test.ex")
- end sublist local_domains
-data from lookup saved for cache for +local_domains: key 'mxt13.test.ex' value 'mxt13.test.ex'
-mxt13.test.ex in "! +local_domains"? yes (end of list)
+mxt13.test.ex in domains?
+ list element: !░+local_domains
+  start sublist local_domains
+   mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
+   ╎list element: !mxt13.test.ex
+   ╎mxt13.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!mxt13.test.ex")
+  end sublist local_domains
+ data from lookup saved for cache for +local_domains: key 'mxt13.test.ex' value 'mxt13.test.ex'
+mxt13.test.ex in domains? yes (end of list)
 calling dnslookup router
 dnslookup router called for k@mxt13.test.ex
   domain = mxt13.test.ex
-list element: *
-mxt13.test.ex in "*"? yes (matched "*")
-DNS lookup of mxt13.test.ex (MX) using fakens
-DNS lookup of mxt13.test.ex (MX) succeeded
-DNS lookup of other1.test.ex (A) using fakens
-DNS lookup of other1.test.ex (A) succeeded
-DNS lookup of other2.test.ex (A) using fakens
-DNS lookup of other2.test.ex (A) succeeded
-list element: +local_domains
- start sublist local_domains
-  list element: !mxt13.test.ex
-  list element: !other1.test.ex
-  other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
- end sublist local_domains
-other1.test.ex in hosts_treat_as_local? no (end of list)
-list element: +local_domains
- start sublist local_domains
-  list element: !mxt13.test.ex
-  list element: !other1.test.ex
-  list element: *.test.ex
-  other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? yes (matched "*.test.ex")
- end sublist local_domains
-other2.test.ex in hosts_treat_as_local? yes (matched "+local_domains")
+main lookup for domain
+ check dnssec require list
+  mxt13.test.ex in dnssec_require_domains? no (option unset)
+ check dnssec request list
+  mxt13.test.ex in dnssec_request_domains?
+   list element: *
+   mxt13.test.ex in dnssec_request_domains? yes (matched "*")
+ DNS lookup of mxt13.test.ex (MX) using fakens
+ DNS lookup of mxt13.test.ex (MX) succeeded
+ DNS lookup of other1.test.ex (A) using fakens
+ DNS lookup of other1.test.ex (A) succeeded
+ DNS lookup of other2.test.ex (A) using fakens
+ DNS lookup of other2.test.ex (A) succeeded
+ other1.test.ex in hosts_treat_as_local?
+  list element: +local_domains
+   start sublist local_domains
+   ╎other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
+   ╎ list element: !mxt13.test.ex
+   ╎ list element: !other1.test.ex
+   ╎ other1.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? no (matched "!other1.test.ex")
+   end sublist local_domains
+ other1.test.ex in hosts_treat_as_local? no (end of list)
+ other2.test.ex in hosts_treat_as_local?
+  list element: +local_domains
+   start sublist local_domains
+   ╎other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"?
+   ╎ list element: !mxt13.test.ex
+   ╎ list element: !other1.test.ex
+   ╎ list element: *.test.ex
+   ╎ other2.test.ex in "!mxt13.test.ex : !other1.test.ex : *.test.ex"? yes (matched "*.test.ex")
+   end sublist local_domains
+  other2.test.ex in hosts_treat_as_local? yes (matched "+local_domains")
 local host in host list - removed hosts:
   other2.test.ex V4NET.12.3.2 5
   other2.test.ex V4NET.12.3.1 5
-fully qualified name = mxt13.test.ex
-host_find_bydns yield = HOST_FOUND (3); returned hosts:
-  other1.test.ex V4NET.12.4.5 MX=4 
+ fully qualified name = mxt13.test.ex
+ host_find_bydns yield = HOST_FOUND (3); returned hosts:
+   other1.test.ex V4NET.12.4.5 MX=4 
 set transport smtp
 queued for smtp transport: local_part = k
 domain = mxt13.test.ex