summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Metzler <ametzler@debian.org>2011-05-08 06:37:40 +0000
committerAndreas Metzler <ametzler@debian.org>2011-05-08 06:37:40 +0000
commitce1d0b93cd03aa5692548dd467620529acb6aa8c (patch)
tree637eb3ecbc1bffaea1a44dfbbca8e2f5b5d77b2b
parentea5450a30c6679924df11fca86a5609b5be8cbe1 (diff)
downloadexim4-ce1d0b93cd03aa5692548dd467620529acb6aa8c.tar.gz
Fix testsuite error.
svn path=/exim/trunk/; revision=2620
-rw-r--r--debian/changelog1
-rw-r--r--debian/minimaltest5
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index b4e134c..c1b2ee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
exim4 (4.76~RC1-2) UNRELEASED; urgency=low
* NOT RELEASED YET
+ * Fix testsuite error.
-- Andreas Metzler <ametzler@debian.org> Sat, 07 May 2011 18:44:52 +0200
diff --git a/debian/minimaltest b/debian/minimaltest
index b39704d..083f6a6 100644
--- a/debian/minimaltest
+++ b/debian/minimaltest
@@ -54,7 +54,7 @@ From from@eximtest.example.com Sat May 07 12:12:12 2012
Return-path: <from@eximtest.example.com>
Envelope-to: recip@eximtest.example.com
Delivery-date: Sat, 07 May 2011 12:12:12 +0000
-Received: from ametzler by eximtest.example.com with local (Exim 4.44))
+Received: from buildd by eximtest.example.com with local (Exim 4.44)
(envelope-from <from@eximtest.example.com>)
id msgid
for recip@eximtest.example.com;Sat, 07 May 2011 12:12:12 +0000
@@ -75,7 +75,8 @@ printf 'From: Testing Exim <from@eximtest.example.com>\nTo: Recipient <recip@exi
$2 -C "$top/exim4.conf" -odf -oep -oi -t -f from@eximtest.example.com
sed -i -e 's/^From \([^ ]*\) .*/From \1 Sat May 07 12:12:12 2012/' \
-e 's/^Delivery-date: .*/Delivery-date: Sat, 07 May 2011 12:12:12 +0000/' \
- -e '/^Received:/s/(Exim [^)]*/(Exim 4.44)/' \
+ -e 's/^Received: from [^ ][^ ]* /Received: from buildd /' \
+ -e '/^Received:/s/(Exim [^)]*/(Exim 4.44/' \
-e '/[[:space:]]for /s/;.*/;Sat, 07 May 2011 12:12:12 +0000/' \
-e '/[[:space:]]id /s/id .*/id msgid/' \
-e 's/^Message-Id: [^@]*/Message-Id: <Emsgid/' \