Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stderr / 0382

diff --git a/test/stderr/0382 b/test/stderr/0382
index 5983fb353c22cc46e5c8cce30654ce7d0a2a3cb3..28d847e34ef18119087f27d5ff449dbc8d62ce7b 100644 (file)
--- a/test/stderr/0382
+++ b/test/stderr/0382
@@ -4,8 +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
-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


@@ -17,16 +15,12 @@ running system filter
 system filter returned 1
 LOG: MAIN
   ** userx@test.ex R=r1: forced fail
 system filter returned 1
 LOG: MAIN
   ** userx@test.ex R=r1: forced fail

-local-accept-delivery forking for bounce-message
-local-accept-delivery forked for bounce-message: npppp

 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss

-bounce-message forking for local-accept-delivery
-bounce-message 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


@@ -52,13 +46,11 @@ admin user
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf
 dropping to exim gid; retaining priv uid
 LOG: queue_run MAIN
   Start queue run: pid=pppp -qf

-fresh-exec forking for qrun-delivery

 LOG: MAIN
   cancelled by timeout_frozen_after
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   cancelled by timeout_frozen_after
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>

-fresh-exec forked for qrun-delivery: npppp

 LOG: queue_run MAIN
   End queue run: pid=pppp -qf
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: queue_run MAIN
   End queue run: pid=pppp -qf
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>