Merge branch 'master' into 4.next

[exim.git] / test / scripts / 0000-Basic / 0504

diff --git a/test/scripts/0000-Basic/0504 b/test/scripts/0000-Basic/0504
index a48e8b4fec7172f0757f1fbe5001d7dbeaf73722..04f19593ed500ed5f2d39829d450cbd812e7bad3 100644 (file)
--- a/test/scripts/0000-Basic/0504
+++ b/test/scripts/0000-Basic/0504
@@ -1,12 +1,10 @@
 # transport filter command fails to execute
 need_ipv4
 #
 # transport filter command fails to execute
 need_ipv4
 #

-exim -odi userx
-transport: t1
+exim -DOPT=t1 -odi userx

 Test 1
 ****
 Test 1
 ****

-exim -odi userx
-transport: t2
+exim -DOPT=t2 -odi userx

 Test 2
 ****
 server PORT_S
 Test 2
 ****
 server PORT_S


@@ -21,8 +19,7 @@ RCPT TO
 DATA
 354 Send it
 ****
 DATA
 354 Send it
 ****

-exim -odi userx
-transport: t3
+exim -DOPT=t3 -odi userx

 Test 3
 ****
 no_msglog_check
 Test 3
 ****
 no_msglog_check