On 2009-11-14 Andreas Metzler <eximusers@???> wrote:
> Hello,
> I have given the test-suite a testrun.
[...]
Hello,
updating the testsuite for 4.70 is a PITA. ;-)
* Exim now inserts (re-sorts or has stopped re-sorting - I do not know
what) Date and Message-ID headers at different places. This breaks
*many* of the tests. I think this was done intentionally andis
related to DKIM, correct? I have pressed (u)pdate for these cases
and should be able to get a patch from there.
* The debug log has gotten a little bit more verbose, logging GnuTLS
compile-time and current versions. Patch attached.
* PDKIM also adds to the debug log, adding a newline followed by
PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
The newline is cumbersome. Are there strong reasons against:
---------------------------------------------------
--- ./src/pdkim/pdkim.c.orig 2009-11-14 14:21:38.000000000 +0100
+++ ./src/pdkim/pdkim.c 2009-11-14 15:03:29.000000000 +0100
@@ -1283,7 +1283,7 @@ DLLEXPORT int pdkim_feed_finish(pdkim_ct
#ifdef PDKIM_DEBUG
if (ctx->debug_stream)
fprintf(ctx->debug_stream,
- "\nPDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
+ "PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<\n");
#endif
}
---------------------------------------------------
The addition of the nonempty line is easily handled by attached patch.
cu and- more stuff to follow - reas
--
`What a good friend you are to him, Dr. Maturin. His other friends are
so grateful to you.'
`I sew his ears on from time to time, sure'
--- /home/ametzler/CVS/exim-test/runtest 2009-10-14 13:34:57.000000000 +0200
+++ runtest 2009-11-14 16:51:39.000000000 +0100
@@ -723,6 +724,10 @@ while(<IN>)
s/\bgethostbyname2?|\bgetipnodebyname/get[host|ipnode]byname[2]/;
+ #drop gnutls version strings
+ next if /GnuTLS compile-time version: \d+[\.\d]+$/;
+ next if /GnuTLS runtime version: \d+[\.\d]+$/;
+
# We have to omit the localhost ::1 address so that all is well in
# the IPv4-only case.
--- /home/ametzler/CVS/exim-test/runtest 2009-10-14 13:34:57.000000000 +0200
+++ runtest 2009-11-14 16:58:00.000000000 +0100
@@ -730,6 +731,9 @@ while(<IN>)
if (/looked up these IP addresses/);
next if /name=localhost address=::1/;
+ # drop pdkim debugging header
+ next if /^PDKIM <<<<<<<<<<<<<<<<<<<<<<<<<<<<<+$/;
+
# Various other IPv6 lines must be omitted too
next if /using host_fake_gethostbyname for \S+ \(IPv6\)/;
