Gitweb:
http://git.exim.org/exim.git/commitdiff/52a7b5f3f80a515983420bf9986f951186c931a5
Commit: 52a7b5f3f80a515983420bf9986f951186c931a5
Parent: 4c115efc45a7e01c36792fd99d7438e6f7352fff
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Mar 31 23:36:12 2015 +0100
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Tue Mar 31 23:36:12 2015 +0100
Fix positive testcase for -oMm
---
test/README | 3 +++
test/log/0040 | 3 +++
test/mail/0040.userx | 15 +++++++++++++++
test/scripts/0000-Basic/0040 | 5 ++++-
test/stderr/0040 | 1 -
5 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/test/README b/test/README
index 653cf95..d971bc7 100644
--- 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 68d7616..d6dfd13 100644
--- 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@???
1999-03-02 09:44:33 10HmaX-0005vi-00 => userx <userx@???> 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@???
+1999-03-02 09:44:33 10HmaY-0005vi-00 => userx <userx@???> 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 24e5cd8..35eb5b5 100644
--- 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@???
+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@???; Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-0005vi-00@???>
+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 12d6750..7dbd7eb 100644
--- 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@???
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@???
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@???
This is a test message.
****
diff --git a/test/stderr/0040 b/test/stderr/0040
index f72bc86..8713911 100644
--- 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
