X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/6023a6ad2ac0294879b14127f62795095da573b5..0929ce9ca518b6987b63cf8659338ca434e07d9b:/test/scripts/4200-International/4201?ds=sidebyside

diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index eb2600682..29e51a9db 100644
--- 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
 ****
@@ -71,195 +71,6 @@ QUIT
 ****
 #
 killdaemon
-exim -DSERVER=server -qqff
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
-exim -DSERVER=server -bd -oX PORT_D
-****
-#
-#
-# commandline/stdin input, normal rcpt & sender, forwarded
-exim -odi -f user.dontcare@test1.com userx@test.ex
-Test message 1.
-.
-****
-# commandline/stdin input, utf-8 rcpt, forwarded
-exim -odi -f user.dontcare@test1.com user.他们为什么不说中文@test.ex
-Test message 2.
-.
-****
-# commandline/stdin input, utf-8 sender, forwarded
-exim -odi -f 他们为什么不说中文@test1.com userx@test.ex
-Test message 3.
-.
-****
-#
-#
-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 -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
-#
-#
-#
-#
-#
-#
-#
-exim -DSERVER=server -bd -oX PORT_D
-****
-#
-# utf-8 to, -bs input and forwarding
-exim -bs -odi
-EHLO client.bh
-MAIL FROM: <userU@test.ex> SMTPUTF8
-RCPT TO: <user.γλυκύρριζα@test.ex>
-DATA
-Subject: test
-
-body
-.
-QUIT
-****
-#
-killdaemon
-exim -DSERVER=server -qqff
-****
-#
-#
-exim -DSERVER=server -bd -oX PORT_D
-****
-#
-# sender verify callout, pass
-exim -bs -odi -DCONTROL="verify=sender/callout"
-EHLO client.bh
-MAIL FROM: <userV.වැල්_මී@test.ex> SMTPUTF8
-RCPT TO: <user.அதிமதுரம்@test.ex>
-DATA
-Subject: test
-
-body
-.
-QUIT
-****
-# sender+random verify callout, pass
-exim -bs -odi -DCONTROL="verify=sender/callout=random"
-EHLO client.bh
-MAIL FROM: <userW@test.ex> SMTPUTF8
-RCPT TO: <user.ഇരട്ടിമധുരം@test.ex>
-DATA
-Subject: test
-
-body
-.
-QUIT
-****
-#
-killdaemon
-exim -DSERVER=server -qqff
-****
-#
-#
-#
-#
-exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
-****
-# sender verify callout, fail
-exim -bs -odi -DCONTROL="verify=sender/callout"
-EHLO client.sfail
-MAIL FROM: <userA@test.ex> SMTPUTF8
-RCPT TO: <user.यष्टिमधु@test.ex>
-QUIT
-****
-# sender+random verify callout, fail
-exim -bs -odi -DCONTROL="verify=sender/callout=random"
-EHLO client.sfail
-MAIL FROM: <userB.જેઠીમધ@test.ex> SMTPUTF8
-RCPT TO: <user.ქართული@test.ex>
-QUIT
-****
-#
-killdaemon
+no_msglog_check