EDITME: Shorten the explanation of <osname> and <build>

[users/heiko/exim.git] / test / stderr / 0380

diff --git a/test/stderr/0380 b/test/stderr/0380
index c653fc309344736e4cf70a72bf1d4dd0afdfbd17..46dc1c55aae5ab0f0b90754aa26b811a3551b7c2 100644 (file)
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -33,7 +33,7 @@ r1 router skipped: local_parts mismatch
 local_part=bbbb domain=myhost.test.ex
 checking local_parts
 calling r2 router
 local_part=bbbb domain=myhost.test.ex
 checking local_parts
 calling r2 router

-rda_interpret (file): 'TESTSUITE/non-exist/$local_part'
+rda_interpret (file): 'TESTSUITE/non-exist/${bless:$local_part}'

 expanded: 'TESTSUITE/non-exist/bbbb'
 TESTSUITE/non-exist/bbbb does not exist
 ignore_enotdir set => skip checking parent directory
 expanded: 'TESTSUITE/non-exist/bbbb'
 TESTSUITE/non-exist/bbbb does not exist
 ignore_enotdir set => skip checking parent directory


@@ -61,7 +61,7 @@ forced failure in expansion of "${if eq {a}{b}{x}fail}" (address_data): decline
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling r1 router
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling r1 router

-rda_interpret (file): 'TESTSUITE/non-exist/$local_part'
+rda_interpret (file): 'TESTSUITE/non-exist/${bless:$local_part}'

 expanded: 'TESTSUITE/non-exist/aaaa'
 TESTSUITE/non-exist/aaaa does not exist
 checking parent directory
 expanded: 'TESTSUITE/non-exist/aaaa'
 TESTSUITE/non-exist/aaaa does not exist
 checking parent directory


@@ -82,5 +82,5 @@ locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => bbbb <bbbb@myhost.test.ex> R=r3 T=t1
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   => bbbb <bbbb@myhost.test.ex> R=r3 T=t1
 locking TESTSUITE/spool/db/retry.lockfile

->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>