Allow relative file names in .include lines (Closes 1971)

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

diff --git a/test/stderr/0315 b/test/stderr/0315
index 01922fbe5ef28952a74f617907c715d109e77bcf..1c3e974f4297a6ce138de3457020af39b815ad5e 100644 (file)
--- a/test/stderr/0315
+++ b/test/stderr/0315
@@ -1,6 +1,8 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: r1 propagating DSN
+DSN: r2 propagating DSN

 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log


@@ -8,6 +10,8 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+DSN: r1 propagating DSN
+DSN: r2 propagating DSN

 delivering 10HmaX-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 delivering 10HmaX-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available


@@ -49,9 +53,9 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN

-  *> x@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1]
+  *> x@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"

 LOG: MAIN
 LOG: MAIN

-  *> y@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1]
+  *> y@ten-1.test.ex R=r1 T=t1 H=ten-1.test.ex [V4NET.0.0.1] C="delivery bypassed by -N option"

 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>


@@ -59,12 +63,16 @@ LOG: MAIN
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user

+DSN: r1 propagating DSN
+DSN: r2 propagating DSN

 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
 LOG: MAIN
   <= CALLER@the.local.host.name U=CALLER P=local S=sss
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user

+DSN: r1 propagating DSN
+DSN: r2 propagating DSN

 delivering 10HmaY-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
 delivering 10HmaY-0005vi-00
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available


@@ -125,9 +133,9 @@ After routing:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN

-  *> x@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2]
+  *> x@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"

 LOG: MAIN
 LOG: MAIN

-  *> y@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2]
+  *> y@ten-2.test.ex R=r2 T=t1 H=ten-2.test.ex [V4NET.0.0.2] C="delivery bypassed by -N option"

 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
 LOG: MAIN
   Completed
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>