Merge branch '4.next'

[users/jgh/exim.git] / test / scripts / 0000-Basic / 0542

diff --git a/test/scripts/0000-Basic/0542 b/test/scripts/0000-Basic/0542
index 6b14852b58898bef89077b87179765714ecafe44..1c8c03b5f3d96b3801620099bc4e902455bd2077 100644 (file)
--- a/test/scripts/0000-Basic/0542
+++ b/test/scripts/0000-Basic/0542
@@ -7,14 +7,15 @@ Subject: The subject is not the object
 This is the body of the message. Make the line longer than any header.
 ****
 sudo exim -be -Mset $msg1
 This is the body of the message. Make the line longer than any header.
 ****
 sudo exim -be -Mset $msg1

-From: $h_from:
-Subject: $h_subject:
+from: $h_from:
+subject: $h_subject:

 message_body_size=$message_body_size
 message_body_size=$message_body_size

-message_size=$message_size

 message_id=$message_id
 message_exim_id=$message_exim_id
 max_received_linelength=$max_received_linelength
 recipients=$recipients
 message_id=$message_id
 message_exim_id=$message_exim_id
 max_received_linelength=$max_received_linelength
 recipients=$recipients

+TESTING_MACROS=$recipients
+(TESTING_MACROS)

 ****
 exim -bs
 mail from:<userz@test.ex>
 ****
 exim -bs
 mail from:<userz@test.ex>


@@ -30,10 +31,9 @@ This is the body of the message. Make the line much longer than any header.
 quit
 ****
 sudo exim -be -Mset $msg2
 quit
 ****
 sudo exim -be -Mset $msg2

-From: $h_from:
-Subject: $h_subject:
+from: $h_from:
+subject: $h_subject:

 message_body_size=$message_body_size
 message_body_size=$message_body_size

-message_size=$message_size

 message_id=$message_id
 message_exim_id=$message_exim_id
 max_received_linelength=$max_received_linelength
 message_id=$message_id
 message_exim_id=$message_exim_id
 max_received_linelength=$max_received_linelength


@@ -51,7 +51,6 @@ exim -bem DIR/test-data
 from: $h_from:
 to: $h_to:
 subject: $h_subject:
 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_size=$message_body_size
 message_exim_id=$message_exim_id
 message_linecount=$message_linecount