Docs: list $spam_ variables in expansions chapter

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

diff --git a/test/stderr/0370 b/test/stderr/0370
index c7f6f360a5edc3ec0f9d6dafbb42876c7dfcfd9b..ddabe6bea506b89262a10e660d9f63a4de60d80d 100644 (file)
--- a/test/stderr/0370
+++ b/test/stderr/0370
@@ -8,9 +8,6 @@ changed uid/gid: privilege not needed
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log

-fresh-exec forking for local-accept delivery
-postfork: local-accept delivery
-fresh-exec forked for local-accept delivery: npppp

 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp
 Exim version x.yz ....
 changed uid/gid: forcing real = effective
   uid=uuuu gid=EXIM_GID pid=pppp


@@ -20,20 +17,11 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> |TESTSUITE/bin/iefbr14 <--------
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> |TESTSUITE/bin/iefbr14 <--------

-fresh-exec forking for delivery (local)
-postfork: delivery (local)

 changed uid/gid: local delivery to |TESTSUITE/bin/iefbr14 <|TESTSUITE/bin/iefbr14> transport=t1
   uid=EXIM_UID gid=CALLER_GID pid=pppp
 t1 transport entered
 direct command:
   argv[0] = 'TESTSUITE/bin/iefbr14'
 changed uid/gid: local delivery to |TESTSUITE/bin/iefbr14 <|TESTSUITE/bin/iefbr14> transport=t1
   uid=EXIM_UID gid=CALLER_GID pid=pppp
 t1 transport entered
 direct command:
   argv[0] = 'TESTSUITE/bin/iefbr14'

-delivery (local) forking for child-open
-postfork: child-open
-fresh-exec forked for delivery (local): npppp
-delivery (local) forked for child-open: npppp
-delivery (local) forking for pipe-transport output
-postfork: pipe-transport output
-delivery (local) forked for pipe-transport output: npppp

 Writing message to pipe
 writing data block fd=dddd size=sss timeout=3600
 writing error EEE: Broken pipe
 Writing message to pipe
 writing data block fd=dddd size=sss timeout=3600
 writing error EEE: Broken pipe


@@ -46,5 +34,5 @@ changed uid/gid: post-delivery tidying
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 LOG: MAIN
   Completed
   uid=EXIM_UID gid=EXIM_GID pid=pppp
 LOG: MAIN
   Completed

->>>>>>>>>>>>>>>> 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 >>>>>>>>>>>>>>>>