X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/d8fe1c03b30ec7dba12669726e41b3b6f5303632..854586e1495b0a0f4be2a561c419ec4671009dbd:/test/stderr/0085?ds=inline

diff --git a/test/stderr/0085 b/test/stderr/0085
index 675c6452c..1b9995eb9 100644
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -48,7 +48,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="smart.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="smart.domain"
@@ -62,18 +62,18 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="smart.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="smart.domain"
 cached data used for lookup of smart.domain
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=abc@d.e.f pattern=x
+address match test: subject=abc@d.e.f pattern=x
 d.e.f in "x"? no (end of list)
-address match: subject=abc@d.e.f pattern=y
+address match test: subject=abc@d.e.f pattern=y
 d.e.f in "y"? no (end of list)
-address match: subject=abc@d.e.f pattern=abc@d.e.f
+address match test: subject=abc@d.e.f pattern=abc@d.e.f
 d.e.f in "d.e.f"? yes (matched "d.e.f")
 abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
 calling smart1 router
@@ -117,7 +117,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="test.ex" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="test.ex"
@@ -131,18 +131,18 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="test.ex" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="test.ex"
 cached data used for lookup of test.ex
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=abc@d.e.f pattern=x
+address match test: subject=abc@d.e.f pattern=x
 d.e.f in "x"? no (end of list)
-address match: subject=abc@d.e.f pattern=y
+address match test: subject=abc@d.e.f pattern=y
 d.e.f in "y"? no (end of list)
-address match: subject=abc@d.e.f pattern=abc@d.e.f
+address match test: subject=abc@d.e.f pattern=abc@d.e.f
 d.e.f in "d.e.f"? yes (matched "d.e.f")
 abc@d.e.f in "x : y : abc@d.e.f"? yes (matched "abc@d.e.f")
 checking require_files
@@ -151,7 +151,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="test.ex.files" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="test.ex.files"
@@ -196,7 +196,7 @@ myhost.test.ex in "test.ex"? no (end of list)
 smart2 router skipped: domains mismatch
 no more routers
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=CALLER_GID pid=pppp
@@ -247,7 +247,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="smart.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="smart.domain"
@@ -261,18 +261,18 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="smart.domain" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="smart.domain"
 cached data used for lookup of smart.domain
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=CALLER@myhost.test.ex pattern=x
+address match test: subject=CALLER@myhost.test.ex pattern=x
 myhost.test.ex in "x"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=y
+address match test: subject=CALLER@myhost.test.ex pattern=y
 myhost.test.ex in "y"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
+address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
 CALLER@myhost.test.ex in "x : y : abc@d.e.f"? no (end of list)
 smart1 router skipped: senders mismatch
 --------> fail_remote_domains router <--------
@@ -314,7 +314,7 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="test.ex" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="test.ex"
@@ -328,18 +328,18 @@ search_open: lsearch "TESTSUITE/aux-fixed/0085.data"
 search_find: file="TESTSUITE/aux-fixed/0085.data"
   key="test.ex" partial=-1 affix=NULL starflags=0
 LRU list:
-  :TESTSUITE/aux-fixed/0085.data
+  0TESTSUITE/aux-fixed/0085.data
   End
 internal_search_find: file="TESTSUITE/aux-fixed/0085.data"
   type=lsearch key="test.ex"
 cached data used for lookup of test.ex
   in TESTSUITE/aux-fixed/0085.data
 lookup yielded: x : y : abc@d.e.f
-address match: subject=CALLER@myhost.test.ex pattern=x
+address match test: subject=CALLER@myhost.test.ex pattern=x
 myhost.test.ex in "x"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=y
+address match test: subject=CALLER@myhost.test.ex pattern=y
 myhost.test.ex in "y"? no (end of list)
-address match: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
+address match test: subject=CALLER@myhost.test.ex pattern=abc@d.e.f
 CALLER@myhost.test.ex in "x : y : abc@d.e.f"? no (end of list)
 smart2 router skipped: senders mismatch
 no more routers
@@ -367,4 +367,4 @@ myhost.test.ex in "test.ex"? no (end of list)
 smart2 router skipped: domains mismatch
 no more routers
 search_tidyup called
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=2 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=2 >>>>>>>>>>>>>>>>