Attempt (2) egrep compat for Solaris vs. Linux

[exim.git] / test / stderr / 3211

diff --git a/test/stderr/3211 b/test/stderr/3211
index c508ef83a3fe30810d6998cc73cc29e1e0c25baa..d6d923d6be85897cc8665a8e9451ed20fafd7347 100644 (file)
--- a/test/stderr/3211
+++ b/test/stderr/3211
@@ -6,8 +6,6 @@
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -21,10 +19,14 @@
 >>> calling skipped router
 >>> skipped router declined for userx@test.again.dns
 >>> calling temp router
->>> test.again.dns in "*"?
->>>  list element: *
->>>  test.again.dns in "*"? yes (matched "*")
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  check dnssec require list
+>>>   test.again.dns in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   test.again.dns in dnssec_request_domains?
+>>>    list element: *
+>>>    test.again.dns in dnssec_request_domains? yes (matched "*")
+>>>  test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  test.again.dns not in empty list (option unset? cannot trace name)
 >>> temp router: defer for userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------
@@ -38,8 +40,6 @@ LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.
 >>> host in helo_verify_hosts? no (option unset)
 >>> host in helo_try_verify_hosts? no (option unset)
 >>> host in helo_accept_junk_hosts? no (option unset)
->>> host in pipelining_connect_advertise_hosts?
->>>  list element: 
 >>> test in helo_lookup_domains?
 >>>  list element: @
 >>>  list element: @[]
@@ -49,14 +49,18 @@ LOG: H=(test) [1.2.3.4] F=<userx@test.ex> temporarily rejected RCPT <userx@test.
 >>> check verify = recipient
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing r1-userx@test.again.dns
->>> test.again.dns in "!testdb;fail"?
+>>> test.again.dns in domains?
 >>>  list element: !testdb;fail
->>> test.again.dns in "!testdb;fail"? yes (end of list)
+>>> test.again.dns in domains? yes (end of list)
 >>> calling r1 router
->>> test.again.dns in "*"?
->>>  list element: *
->>>  test.again.dns in "*"? yes (matched "*")
->>> test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  check dnssec require list
+>>>   test.again.dns in dnssec_require_domains? no (option unset)
+>>>  check dnssec request list
+>>>   test.again.dns in dnssec_request_domains?
+>>>    list element: *
+>>>    test.again.dns in dnssec_request_domains? yes (matched "*")
+>>>  test.again.dns in dns_again_means_nonexist? no (option unset)
+>>>  test.again.dns not in empty list (option unset? cannot trace name)
 >>> r1 router: defer for r1-userx@test.again.dns
 >>>   message: host lookup did not complete
 >>> ----------- end verify ------------