X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/b6d223625238f89971d94711d6c5fc240ba2cd72..3fc596e4b0c7cf80a344c895b0cc09d6f0fb4dae:/test/runtest?ds=inline diff --git a/test/runtest b/test/runtest index dab23acec..affd82ad4 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.30 2007/08/30 13:35:29 ph10 Exp $ +# $Cambridge: exim/test/runtest,v 1.33 2009/11/23 13:22:05 nm4 Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -23,7 +23,7 @@ use Socket; # Start by initializing some global variables -$testversion = "4.68 (23-Aug-07)"; +$testversion = "4.71 (23-Nov-09)"; $cf = "bin/cf"; $cr = "\r"; @@ -723,6 +723,10 @@ while() 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() 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\)/;