Added -bem option.

3 files changed, 55 insertions, 2 deletions

diff --git a/test/scripts/0000-Basic/0542 b/test/scripts/0000-Basic/0542
index 90645d746..090c2bf34 100644
--- a/test/scripts/0000-Basic/0542
+++ b/test/scripts/0000-Basic/0542
@@ -1,4 +1,4 @@
-# -Mset
+# -Mset and -bem
 exim userx@test.x usery@test.ex
 From: Himself <himself@there.tld>
 To: Yourself <you@here.tld>
@@ -13,5 +13,35 @@ message_body_size=$message_body_size
 message_size=$message_size
 message_id=$message_id
 message_exim_id=$message_exim_id
+recipients=$recipients
+****
+write test-data
+From: A Person <a.person@a.domain.tld>
+To: First <first@test.ex>, Second <second@test.ex>
+Subject: The subject is moot
+
+And now we have the body of the message,
+containing a small number of lines.
+****
+exim -bem DIR/test-data
+from: $h_from:
+to: $h_to:
+subject: $h_subject:
+message_size=$message_size
+message_body_size=$message_body_size
+message_exim_id=$message_exim_id
+message_linecount=$message_linecount
+message_body_linecount=$body_linecount
+headers -----------------
+$message_headers
+
+body --------------------
+$message_body
+
+body end ----------------
+$message_body_end
+****
+exim -bem DIR/test-data -t
+recipients=$recipients
 ****
 no_msglog_check
diff --git a/test/stderr/0070 b/test/stderr/0070
index ccb6d3f67..ebcc21390 100644
--- a/test/stderr/0070
+++ b/test/stderr/0070
@@ -56,7 +56,6 @@ MUNGED: ::1 will be omitted in what follows
 >>> using ACL "rcpt"
 >>> processing "require"
 >>> check verify = helo
->>> verifying EHLO/HELO argument "[V4NET.0.0.1]"
 >>> require: condition test failed
 LOG: H=([V4NET.0.0.1]) [V4NET.0.0.2] F=<a@b> rejected RCPT <c@d>: helo not verified
 >>> host in hosts_connection_nolog? no (option unset)
diff --git a/test/stdout/0542 b/test/stdout/0542
index aecedca72..4bce403cc 100644
--- a/test/stdout/0542
+++ b/test/stdout/0542
@@ -4,4 +4,28 @@
 > message_size=416
 > message_id=10HmaX-0005vi-00
 > message_exim_id=10HmaX-0005vi-00
+> recipients=userx@test.x, usery@test.ex
+> 
+> from: A Person <a.person@a.domain.tld>
+> to: First <first@test.ex>, Second <second@test.ex>
+> subject: The subject is moot
+> message_size=197
+> message_body_size=77
+> message_exim_id=10HmaY-0005vi-00
+> message_linecount=4
+> message_body_linecount=2
+> headers -----------------
+> From: A Person <a.person@a.domain.tld>
+To: First <first@test.ex>, Second <second@test.ex>
+Subject: The subject is moot
+Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+> 
+> body --------------------
+> And now we have the body of the message, containing a small number of lines. 
+> 
+> body end ----------------
+> And now we have the body of the message, containing a small number of lines. 
+> 
+> recipients=first@test.ex, second@test.ex
 >