X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/6588a91814f9a269bb91a5311edf15a4b52410e2..0761d44e:/test/runtest?ds=sidebyside diff --git a/test/runtest b/test/runtest index a169d1550..d65d0b530 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.18 2006/11/07 15:11:34 ph10 Exp $ +# $Cambridge: exim/test/runtest,v 1.37 2010/06/14 20:30:12 jetmore Exp $ ############################################################################### # This is the controlling script for the "new" test suite for Exim. It should # @@ -23,9 +23,9 @@ use Socket; # Start by initializing some global variables -$testversion = "4.64 (05-Sep-06)"; +$testversion = "4.72 (02-Jun-10)"; -$cf = "bin/cf"; +$cf = "bin/cf -exact"; $cr = "\r"; $debug = 0; $force_update = 0; @@ -330,7 +330,8 @@ while() s/TlRMTVNTUAACAAAAAAAAAAAoAAABgg[\w+\/]+/TlRMTVNTUAACAAAAAAAAAAAoAAABggAAAEbBRwqFwwIAAAAAAAAAAAAt1sgAAAAA/; # PRVS values - s?prvs=([^/]+)/[\da-f]{10}@?prvs=$1/xxxxxxxxxx@?g; + s?prvs=([^/]+)/[\da-f]{10}@?prvs=$1/xxxxxxxxxx@?g; # Old form + s?prvs=[\da-f]{10}=([^@]+)@?prvs=xxxxxxxxxx=$1@?g; # New form # Error lines on stdout from SSL contain process id values and file names. # They also contain a source file name and line number, which may vary from @@ -338,6 +339,9 @@ while() s/^\d+:error:/pppp:error:/; s/:(?:\/[^\s:]+\/)?([^\/\s]+\.c):\d+:/:$1:dddd:/; + # There are differences in error messages between OpenSSL versions + s/SSL_CTX_set_cipher_list/SSL_connect/; + # One error test in expansions mentions base 62 or 36 s/is not a base (36|62) number/is not a base 36\/62 number/; @@ -429,8 +433,15 @@ while() # Date/time in exim -bV output s/\d\d-[A-Z][a-z]{2}-\d{4}\s\d\d:\d\d:\d\d/07-Mar-2000 12:21:52/g; + # Time on queue tolerance + s/QT=1s/QT=0s/; + + # Eximstats heading + s/Exim\sstatistics\sfrom\s\d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d\sto\s + \d{4}-\d\d-\d\d\s\d\d:\d\d:\d\d/Exim statistics from