Fix positive testcase for -oMm

diff --git a/test/README b/test/README
index 653cf951f31489b19ca24189a10a85ed65d8126a..d971bc7441bca055069f2890b4b48cf9a523482b 100644 (file)
--- a/test/README
+++ b/test/README
@@ -116,6 +116,9 @@ In order to run this test suite, the following requirements must be met:
 
 (9) Exim must be built with TRUSTED_CONFIG_LIST support, so that the test
     configs can be placed into it.  A suitable file location is .../exim/test/trusted_configs
+    with content .../exim/test/test-config [fill out the ... to make full
+    paths].  This file should be owner/group matching CONFIGURE_OWNER/GROUP,
+    or root/root.  The config files in .../exim/test/confs/ should be owner/group the same.
     DISABLE_D_OPTION must not be used. If ALT_CONFIG_PREFIX is used, it
     must contain the directory of the test-suite.  WHITELIST_D_MACROS should contain:
     

diff --git a/test/log/0040 b/test/log/0040
index 68d76164f791a865264131e8ab40c75e57faecce..d6dfd136275683329029ed73b75112ecd2ce500d 100644 (file)
--- a/test/log/0040
+++ b/test/log/0040
@@ -1,3 +1,6 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= jc@rome H=forum.rome [1.1.1.1] U=jc44bc P=latin S=sss for userx@test.ex
 1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@test.ex> R=localuser T=local_delivery
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
+1999-03-02 09:44:33 10HmaY-0005vi-00 <= jc@rome R=10HmaZ-0005vi-00 U=jc44bc P=local S=sss for userx@test.x
+1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@test.x> R=localuser T=local_delivery
+1999-03-02 09:44:33 10HmaY-0005vi-00 Completed

diff --git a/test/mail/0040.userx b/test/mail/0040.userx
index 24e5cd89297aa0979d611df19e3e56352e188fea..35eb5b5fe94c8871509ddae0aff5922af04ef9b5 100644 (file)
--- a/test/mail/0040.userx
+++ b/test/mail/0040.userx
@@ -11,3 +11,18 @@ X-interface: 2.2.2.2
 
 This is a test message.
 
+From jc@rome Tue Mar 02 09:44:33 1999
+Return-path: <jc@rome>
+Envelope-to: userx@test.x
+Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
+Received: from jc44bc by the.local.host.name with local (Exim x.yz)
+       (envelope-from <jc@rome>)
+       id 10HmaY-0005vi-00
+       for userx@test.x; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+From: Julius Caesar <jc@rome>
+Date: Tue, 2 Mar 1999 09:44:33 +0000
+X-interface: 
+
+This is a test message.
+

diff --git a/test/scripts/0000-Basic/0040 b/test/scripts/0000-Basic/0040
index 12d6750436c8107fe86054fabb718bac6493e4e6..7dbd7eb0a7c61870cfefbffc7b26af76b73c2441 100644 (file)
--- a/test/scripts/0000-Basic/0040
+++ b/test/scripts/0000-Basic/0040
@@ -2,11 +2,14 @@
 exim -odi -f jc@rome -F 'Julius Caesar' -oMa 1.1.1.1 -oMi 2.2.2.2 -oMr latin -oMs forum.rome -oMt jc44bc userx@test.ex
 This is a test message.
 ****
+#
+# fail on bad -oMm message id
 1
 exim -odi -f jc@rome -F 'Julius Caesar' -oMm 123456-67890-11 -oMt jc44bc userx@test.x
 This is a test message.
 ****
-1
+#
+# do not fail on good -oMm message id
 exim -odi -f jc@rome -F 'Julius Caesar' -oMm 10HmaX-0005vi-00 -oMt jc44bc userx@test.x
 This is a test message.
 ****

diff --git a/test/stderr/0040 b/test/stderr/0040
index f72bc868b4d015b990f505e28c6f2a2490470d42..8713911aecb142540b6365f3237a2b584d811b4f 100644 (file)
--- a/test/stderr/0040
+++ b/test/stderr/0040
@@ -1,2 +1 @@
 -oMm must be a valid message ID
--oMm must be called by a trusted user/config