Testsuite: avoid testsuite installation path issue

[exim.git] / test / stderr / 0371

diff --git a/test/stderr/0371 b/test/stderr/0371
index 25c6cdbeedd1432cb7c5f8b1a21839a1133cd716..d0182297806cba503e0a436fff0a265f5d9b262c 100644 (file)
--- a/test/stderr/0371
+++ b/test/stderr/0371
@@ -21,7 +21,7 @@ host in helo_verify_hosts? no (option unset)
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect"
 host in helo_try_verify_hosts? no (option unset)
 host in helo_accept_junk_hosts? no (option unset)
 using ACL "connect"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 23)

 check set acl_c0 = $acl_c0; connect
                  = ; connect
 check set acl_c9 = $acl_c9; connect
 check set acl_c0 = $acl_c0; connect
                  = ; connect
 check set acl_c9 = $acl_c9; connect


@@ -48,7 +48,7 @@ SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 using ACL "mail"
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 using ACL "mail"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 27)

 check set acl_c0 = $acl_c0; mail
                  = ; connect; mail
 check set acl_c9 = $acl_c9; mail
 check set acl_c0 = $acl_c0; mail
                  = ; connect; mail
 check set acl_c9 = $acl_c9; mail


@@ -60,7 +60,7 @@ end of ACL "mail": ACCEPT
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 using ACL "rcpt"
 SMTP>> 250 OK
 SMTP<< rcpt to:<x@y>
 using ACL "rcpt"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 32)

 check set acl_m0 = $acl_m0; rcpt
                  = ; mail; rcpt
 check set acl_m9 = $acl_m9; rcpt
 check set acl_m0 = $acl_m0; rcpt
                  = ; mail; rcpt
 check set acl_m9 = $acl_m9; rcpt


@@ -70,14 +70,9 @@ check set acl_c0 = $acl_c0; rcpt
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted
 accept: condition test succeeded in ACL "rcpt"
 end of ACL "rcpt": ACCEPT
 SMTP>> 250 Accepted

-DSN: orcpt: NULL  flags: 0

 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called
 SMTP<< data
 SMTP>> 354 Enter message, ending with "." on a line by itself
 search_tidyup called

-PDKIM >> raw hdr: {CR}{LF}
-PDKIM >> raw hdr: .{CR}{LF}
-PDKIM >> raw hdr: vrfy{SP}x@y{CR}{LF}
-PDKIM >> raw hdr: mail{SP}from:<x@y>{CR}{LF}

 >>Headers received:
 
 search_tidyup called
 >>Headers received:
 
 search_tidyup called


@@ -90,18 +85,16 @@ P Received: from [V4NET.0.0.0] (helo=something)
        by mail.test.ex with esmtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00
        by mail.test.ex with esmtp (Exim x.yz)
        (envelope-from <x@y>)
        id 10HmaX-0005vi-00

-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-PDKIM >> raw hdr: quit{CR}{LF}
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000

 using ACL "data"
 using ACL "data"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 37)

 check set acl_m0 = $acl_m0; data
                  = ; mail; rcpt; data
 check set acl_m9 = $acl_m9; data
                  = ; rcpt; data
 accept: condition test succeeded in ACL "data"
 end of ACL "data": ACCEPT
 check set acl_m0 = $acl_m0; data
                  = ; mail; rcpt; data
 check set acl_m9 = $acl_m9; data
                  = ; rcpt; data
 accept: condition test succeeded in ACL "data"
 end of ACL "data": ACCEPT

-calling local_scan(); timeout=300
-local_scan() returned 0 NULL

 LOG: MAIN
   <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00
 LOG: MAIN
   <= x@y H=(something) [V4NET.0.0.0] P=esmtp S=sss
 SMTP>> 250 OK id=10HmaX-0005vi-00


@@ -109,7 +102,7 @@ smtp_setup_msg entered
 SMTP<< vrfy x@y
 host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 using ACL "vrfy"
 SMTP<< vrfy x@y
 host in smtp_accept_max_nonmail_hosts? yes (matched "*")
 using ACL "vrfy"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 41)

 check set acl_c0 = $acl_c0; vrfy
                  = ; connect; mail; rcpt; vrfy
 check set acl_c9 = $acl_c9; vrfy
 check set acl_c0 = $acl_c0; vrfy
                  = ; connect; mail; rcpt; vrfy
 check set acl_c9 = $acl_c9; vrfy


@@ -132,7 +125,7 @@ SMTP<< mail from:<x@y>
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 using ACL "mail"
 spool directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100 msg_size = 0
 log directory space = nnnnnK inodes = nnnnn check_space = 10240K inodes = 100
 using ACL "mail"

-processing "accept"
+processing "accept" (TESTSUITE/test-config 27)

 check set acl_c0 = $acl_c0; mail
                  = ; connect; mail; rcpt; vrfy; mail
 check set acl_c9 = $acl_c9; mail
 check set acl_c0 = $acl_c0; mail
                  = ; connect; mail; rcpt; vrfy; mail
 check set acl_c9 = $acl_c9; mail


@@ -147,4 +140,4 @@ SMTP>> 221 mail.test.ex closing connection
 LOG: smtp_connection MAIN
   SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
 search_tidyup called
 LOG: smtp_connection MAIN
   SMTP connection from (something) [V4NET.0.0.0] closed by QUIT
 search_tidyup called

->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>