X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/250b68713b5810a824bb14337b98737b6b81bf53..946515bfe62796f6c0d6554e9e1e227f33253e7c:/test/scripts/4200-International/4201

diff --git a/test/scripts/4200-International/4201 b/test/scripts/4200-International/4201
index 17b97c7e6..fc9a50741 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
 ****
@@ -31,7 +31,7 @@ QUIT
 ****
 #
 #
-# utf-8 from, Basic smtp input, no delivery
+# utf-8 from, Basic smtp input, no delivery.  Two messages in a connection.
 client 127.0.0.1 PORT_D
 ??? 220
 EHLO client
@@ -52,35 +52,27 @@ Subject: test
 body
 .
 ??? 250
-QUIT
-??? 221
-****
-#
-#
-# utf-8 from, -bs input and forwarding
-exim -bs -odi
-EHLO client.bh
-MAIL FROM: <他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> SMTPUTF8
+MAIL FROM: <ليهمابتكلموشعربي؟@czech.Pročprostěnemluvíčesky.com> SMTPUTF8
+??? 250
 RCPT TO: <usery@test.ex>
+??? 250
 DATA
+??? 354
 Subject: test
 
 body
 .
+??? 250
 QUIT
+??? 221
 ****
 #
 #
-#
-killdaemon
-exim -DSERVER=server -DOPTION="" -bd -oX PORT_D
-****
-#
-# forwarding fails when target does not support SMTPUTF8
+# utf-8 from, -bs input and forwarding
 exim -bs -odi
-EHLO client.ffail
-MAIL FROM: <यहलोगहिन्दीक्योंनहींबोलसकतेहैं@japanese.なぜみんな日本語を話してくれないのか.com> SMTPUTF8
-RCPT TO: <userz@test.ex>
+EHLO client.bh
+MAIL FROM: <他们为什么不说中文@hebrew.למההםפשוטלאמדבריםעברית.com> SMTPUTF8
+RCPT TO: <usery@test.ex>
 DATA
 Subject: test
 
@@ -89,10 +81,7 @@ body
 QUIT
 ****
 #
-#
-#
 killdaemon
-exim -DSERVER=server -qq
+exim -DSERVER=server -DNOTDAEMON -qqff
 ****
 no_msglog_check
-