Fix log line corruption for DKIM status

[exim.git] / test / scripts / 4200-International / 4201

diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index a697764f58f7c2a7c04c741010b9e058fc11be1e..29e51a9dbc028578f35872e0a3dd79bf20feaab5 100644 (file)
--- a/test/scripts/4200-International/4201
+++ b/test/scripts/4200-International/4201
@@ -1,5 +1,5 @@
-# Internationalised mail: smtp
-# Exim test configuration 4200
+# Internationalised mail: smtp input and forwarding
+# Exim test configuration 4201
 #
 exim -DSERVER=server -bd -oX PORT_D
 ****
@@ -65,99 +65,12 @@ RCPT TO: <usery@test.ex>
 DATA
 Subject: test
 
-body
-.
-QUIT
-****
-#
-#
-#
-killdaemon
-exim -DSERVER=server -qqff
-****
-#
-#
-exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
-****
-#
-# forwarding fails when target does not support SMTPUTF8
-exim -bs -odi
-EHLO client.ffail
-MAIL FROM: <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.local> SMTPUTF8
-RCPT TO: <userz@test.ex>
-DATA
-Subject: test
-
-body
-.
-QUIT
-****
-#
-#
-#
-killdaemon
-#
-exim -qfl
-****
-#
-#
-#
-#
-#
-exim -DSERVER=server -bd -oX PORT_D
-****
-#
-# Recipient verify callout, pass
-exim -bs -odi -DCONTROL="verify=recipient/callout"
-EHLO client.bh
-MAIL FROM: <세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> SMTPUTF8
-RCPT TO: <userQ@test.ex>
-DATA
-Subject: test
-
-body
-.
-QUIT
-****
-# Recipient+random verify callout, pass
-exim -bs -odi -DCONTROL="verify=recipient/callout=random"
-EHLO client.bh
-MAIL FROM: <세계의모든사람들이한국어를이해한다면얼마나좋을까@russian.почемужеонинеговорятпорусски.com> SMTPUTF8
-RCPT TO: <userR@test.ex>
-DATA
-Subject: test
-
 body
 .
 QUIT
 ****
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
-#
-#
-#
-#
-#
-exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
-****
-#
-# Recipient verify callout, fail
-exim -bs -odi -DCONTROL="verify=recipient/callout"
-EHLO client.ffail
-MAIL FROM: <CALLER@spanish.PorquénopuedensimplementehablarenEspañol.local> SMTPUTF8
-RCPT TO: <userS@test.ex>
-QUIT
-****
-#
-# Recipient+random verify callout, fail
-exim -bs -odi -DCONTROL="verify=recipient/callout=random"
-EHLO client.ffail
-MAIL FROM: <CALLER@vietnamese.TạisaohọkhôngthểchỉnóitiếngViệt.local> SMTPUTF8
-RCPT TO: <userT@test.ex>
-QUIT
-****
-#
-killdaemon
-#
+no_msglog_check