better guards

[users/jgh/exim.git] / test / stderr / 0393

diff --git a/test/stderr/0393 b/test/stderr/0393
index d3e3862f7b87511eb06380d289fb5524673bb6e0..0177ee36d90cbb7bd29da1f076dd35966749de49 100644 (file)
--- a/test/stderr/0393
+++ b/test/stderr/0393
@@ -4,9 +4,6 @@ admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@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 ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -14,8 +11,6 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------

-local-accept-delivery forking for delivery-local
-postfork: delivery-local

 direct command:
   argv[0] = '/bin/cat'
 direct command after expansion:
 direct command:
   argv[0] = '/bin/cat'
 direct command after expansion:


@@ -33,17 +28,10 @@ lock file created
 mailbox TESTSUITE/test-mail/userx is locked
 writing to file TESTSUITE/test-mail/userx
 writing data block fd=dddd size=sss timeout=0
 mailbox TESTSUITE/test-mail/userx is locked
 writing to file TESTSUITE/test-mail/userx
 writing data block fd=dddd size=sss timeout=0

-delivery-local forking for transport-filter
-postfork: transport-filter
-local-accept-delivery forked for delivery-local: npppp
-delivery-local forked for transport-filter: npppp

 process pppp running as transport filter: fd_write=dddd fd_read=dddd
 process pppp running as transport filter: fd_write=dddd fd_read=dddd

-delivery-local forking for tpt-filter-writer
-postfork: tpt-filter-writer

 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=0
 >>>>>>>>>>>>>>>> Exim pid=pppp (tpt-filter-writer) terminating with rc=0 >>>>>>>>>>>>>>>>
 cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=0
 >>>>>>>>>>>>>>>> Exim pid=pppp (tpt-filter-writer) terminating with rc=0 >>>>>>>>>>>>>>>>

-delivery-local forked for tpt-filter-writer: npppp

 process pppp writing to transport filter
 copying from the filter
 waiting for filter process
 process pppp writing to transport filter
 copying from the filter
 waiting for filter process


@@ -64,9 +52,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss

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

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -74,8 +59,6 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------

-local-accept-delivery forking for delivery-local
-postfork: delivery-local

 direct command:
 direct command after expansion:
 appendfile transport entered
 direct command:
 direct command after expansion:
 appendfile transport entered


@@ -95,7 +78,6 @@ cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd

-local-accept-delivery forked for delivery-local: npppp

 t1 transport returned OK for userx@test.ex
 LOG: MAIN
   => userx <userx@test.ex> R=r1 T=t1
 t1 transport returned OK for userx@test.ex
 LOG: MAIN
   => userx <userx@test.ex> R=r1 T=t1


@@ -108,9 +90,6 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 admin user
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss

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

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user


@@ -118,8 +97,6 @@ admin user
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------
 dropping to exim gid; retaining priv uid
 >>>>>>>>>>>>>>>> Local deliveries >>>>>>>>>>>>>>>>
 --------> userx@test.ex <--------

-local-accept-delivery forking for delivery-local
-postfork: delivery-local

 direct command:
   argv[0] = '${if={1}{1}{}{}}'
 direct command after expansion:
 direct command:
   argv[0] = '${if={1}{1}{}{}}'
 direct command after expansion:


@@ -141,7 +118,6 @@ cannot use sendfile for body: spoolfile not wireformat
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 appendfile yields 0 with errno=dd more_errno=dd

-local-accept-delivery forked for delivery-local: npppp

 t1 transport returned OK for userx@test.ex
 LOG: MAIN
   => userx <userx@test.ex> R=r1 T=t1
 t1 transport returned OK for userx@test.ex
 LOG: MAIN
   => userx <userx@test.ex> R=r1 T=t1