tidying

[exim.git] / test / mail / 0164.CALLER

diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER
index 256103573c021fa88742c143a22b41a48ef928ab..62c91e15f447c497c952d0e1d26fe4fefb294fb6 100644 (file)
--- a/test/mail/0164.CALLER
+++ b/test/mail/0164.CALLER
@@ -1,7 +1,8 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -21,12 +22,12 @@ This message was created automatically by mail delivery software.
 A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
-  pipe to |TESTSUITE/aux-fixed/showenv $recipients
+  pipe to |TESTSUITE/aux-fixed/showenv "${map {<, $recipients} {${if match_address {$item} {pipe@test.ex : another@test.ex : a-third@test.ex} {$value}}}}"
     generated by system-filter
 
 The following text was generated during the delivery attempt:
 
------- pipe to |TESTSUITE/aux-fixed/showenv $recipients
+------ pipe to |TESTSUITE/aux-fixed/showenv "${map {<, $recipients} {${if match_address {$item} {pipe@test.ex : another@test.ex : a-third@test.ex} {$value}}}}"
        generated by system-filter ------
 
 Test pipe script
@@ -60,7 +61,8 @@ USER=system-filter
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
-       for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for pipe@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -84,7 +86,8 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
-       for pipe@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for pipe@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -95,7 +98,8 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
-       for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 X-Failed-Recipients: system-filter
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
@@ -115,19 +119,19 @@ This message was created automatically by mail delivery software.
 A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
-  pipe to |TESTSUITE/aux-fixed/showenv $recipients
+  pipe to |TESTSUITE/aux-fixed/showenv "${map {<, $recipients} {${if match_address {$item} {pipe@test.ex : another@test.ex : a-third@test.ex} {$value}}}}"
     generated by system-filter
 
 The following text was generated during the delivery attempt:
 
------- pipe to |TESTSUITE/aux-fixed/showenv $recipients
+------ pipe to |TESTSUITE/aux-fixed/showenv "${map {<, $recipients} {${if match_address {$item} {pipe@test.ex : another@test.ex : a-third@test.ex} {$value}}}}"
        generated by system-filter ------
 
 Test pipe script
 Running as: CALLER
 ------------------
 Args:
-  pipe@test.ex, another@test.ex, a-third@test.ex
+  pipe@test.ex,another@test.ex,a-third@test.ex
 ----------current-----------
 /
 ----------env-----------
@@ -153,7 +157,8 @@ USER=system-filter
 >From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaZ-0005vi-00;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -176,7 +181,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
-       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaZ-0005vi-00;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000