Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / test / scripts / 5700-deliv-log / 5700

diff --git a/test/scripts/5700-deliv-log/5700 b/test/scripts/5700-deliv-log/5700
index 2082b14f5de1778f627bb26829fc8fcfab91a19e..dccf02ca563016fd4600fa84540b7c69735e03ae 100644 (file)
--- a/test/scripts/5700-deliv-log/5700
+++ b/test/scripts/5700-deliv-log/5700
@@ -22,7 +22,7 @@ DATA
 QUIT
 220 OK
 ****
 QUIT
 220 OK
 ****

-exim -d+deliver+expand+acl -qqf
+exim -qqf

 ****
 #
 #
 ****
 #
 #


@@ -32,7 +32,7 @@ server PORT_S
 EHLO
 *sleep 4
 ****
 EHLO
 *sleep 4
 ****

-exim -d-all+deliver+acl+expand -odi userx@domain1.com
+exim -odi userx@domain1.com

 A message which will hit a timeout
 .
 ****
 A message which will hit a timeout
 .
 ****