Add predefined macros for expansions

[exim.git] / test / stderr / 0545

diff --git a/test/stderr/0545 b/test/stderr/0545
index 9dfefed32295084b244555bfff577733fad8a7b8..01621df470a6385c7dd8d20336428c7485be7df2 100644 (file)
--- a/test/stderr/0545
+++ b/test/stderr/0545
@@ -1,6 +1,6 @@
 Exim version x.yz ....
 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
@@ -20,30 +20,18 @@ dns router called for userx@alias-eximtesthost
   domain = alias-eximtesthost
 alias-eximtesthost in "*"? yes (matched "*")
 DNS lookup of alias-eximtesthost (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
 alias-eximtesthost (MX resp) DNSSEC
 DNS lookup of alias-eximtesthost (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost (A) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of eximtesthost.test.ex (A) succeeded
 local host found for non-MX address
 fully qualified name = alias-eximtesthost.test.ex
@@ -62,22 +50,13 @@ dns router called for userx@alias-eximtesthost.test.ex
   domain = alias-eximtesthost.test.ex
 alias-eximtesthost.test.ex in "*"? yes (matched "*")
 DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
-DNS lookup of eximtesthost.test.ex-MX: using cached value DNS_NODATA
+DNS lookup of eximtesthost.test.ex (MX): using cached value DNS_NODATA
 DNS lookup of alias-eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost.test.ex (A) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of eximtesthost.test.ex (A) succeeded
 local host found for non-MX address
 fully qualified name = alias-eximtesthost.test.ex
@@ -87,16 +66,16 @@ set transport smtp
 queued for smtp transport: local_part = userx
 domain = alias-eximtesthost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by dns router
   envelope to: userx@alias-eximtesthost.test.ex
   transport: smtp
   host eximtesthost.test.ex [ip4.ip4.ip4.ip4]
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
-  uid=uuuu gid=CALLER_GID pid=pppp
+  uid=uuuu gid=CALLER_GID pid=p1235
 configuration file is TESTSUITE/test-config
 admin user
 dropping to exim gid; retaining priv uid
@@ -116,30 +95,18 @@ dns router called for userx@alias-eximtesthost.test.ex
   domain = alias-eximtesthost.test.ex
 alias-eximtesthost.test.ex in "*"? yes (matched "*")
 DNS lookup of alias-eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost.test.ex (MX) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (MX) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of eximtesthost.test.ex (MX) gave NO_DATA
 returning DNS_NODATA
 faking res_search(MX) response length as 65535
  writing neg-cache entry for eximtesthost.test.ex-MX-xxxx, ttl 3000
 alias-eximtesthost.test.ex (MX resp) DNSSEC
 DNS lookup of alias-eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of alias-eximtesthost.test.ex (A) succeeded
 CNAME found: change to eximtesthost.test.ex
 DNS lookup of eximtesthost.test.ex (A) using fakens
-fresh-exec forking for fakens-search
-postfork: fakens-search
-fresh-exec forked for fakens-search: npppp
 DNS lookup of eximtesthost.test.ex (A) succeeded
 local host found for non-MX address
 fully qualified name = alias-eximtesthost.test.ex
@@ -149,10 +116,10 @@ set transport smtp
 queued for smtp transport: local_part = userx
 domain = alias-eximtesthost.test.ex
   errors_to=NULL
-  domain_data=NULL localpart_data=NULL
+  domain_data=NULL local_part_data=NULL
 routed by dns router
   envelope to: userx@alias-eximtesthost.test.ex
   transport: smtp
   host eximtesthost.test.ex [ip4.ip4.ip4.ip4]
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1235 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>