summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorNigel Metheringham <nigel@exim.org>2009-11-19 18:51:11 +0000
committerNigel Metheringham <nigel@exim.org>2009-11-19 18:51:11 +0000
commitf2dd649a6558f5a4cf6c7f576e2fbc0d2a27730d (patch)
tree348bc35e0f2d4694c6f276eeb25e223450fc2557 /test
parentca5aa725ec67d4335f4a41738dd3b7dc0d17393d (diff)
Better filtering of debug in test suite
Diffstat (limited to 'test')
-rwxr-xr-xtest/runtest9
1 files changed, 8 insertions, 1 deletions
diff --git a/test/runtest b/test/runtest
index d0caf0df3..2af47eb62 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
-# $Cambridge: exim/test/runtest,v 1.31 2009/10/14 11:34:57 nm4 Exp $
+# $Cambridge: exim/test/runtest,v 1.32 2009/11/19 18:51:11 nm4 Exp $
###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
@@ -723,6 +723,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.
@@ -730,6 +734,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\)/;