Tweak debug output

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

diff --git a/test/mail/0164.CALLER b/test/mail/0164.CALLER
index 3bfb359b686bd857ca6f9be0bfcb4e83a7e8aa58..62c91e15f447c497c952d0e1d26fe4fefb294fb6 100644 (file)
--- a/test/mail/0164.CALLER
+++ b/test/mail/0164.CALLER
@@ -22,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:
 
 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:
 
     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
        generated by system-filter ------
 
 Test pipe script


@@ -119,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:
 
 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:
 
     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:
        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-----------
 ----------current-----------
 /
 ----------env-----------