diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-06-14 13:20:38 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2007-06-14 13:20:38 +0000 |
| commit | 85b6260ab044acdf976d2d128cf7639d57c79e75 (patch) | |
| tree | 9b361f48d1153afb458db187c625554c0add3745 | |
| parent | 2e3068d94ceb32aebca45f68c67e7f7b1fa99cb0 (diff) | |
Update tests for new prvs format; update version number.
| -rwxr-xr-x | test/runtest | 7 | ||||
| -rw-r--r-- | test/stdout/0002 | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/test/runtest b/test/runtest index 775f658e2..aba266292 100755 --- a/test/runtest +++ b/test/runtest @@ -1,6 +1,6 @@ #! /usr/bin/perl -w -# $Cambridge: exim/test/runtest,v 1.26 2007/04/17 13:05:41 ph10 Exp $ +# $Cambridge: exim/test/runtest,v 1.27 2007/06/14 13:20:38 ph10 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.67 (16-Apr-07)"; +$testversion = "4.68 (16-Apr-07)"; $cf = "bin/cf"; $cr = "\r"; @@ -330,7 +330,8 @@ while(<IN>) 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 diff --git a/test/stdout/0002 b/test/stdout/0002 index 2b2b0881f..8516f5f82 100644 --- a/test/stdout/0002 +++ b/test/stdout/0002 @@ -575,9 +575,9 @@ xyz > > # PRVS > -> prvs=userx/xxxxxxxxxx@test.ex -> prvs=userx/xxxxxxxxxx@test.ex -> prvs=userx/xxxxxxxxxx@test.ex +> prvs=xxxxxxxxxx=userx@test.ex +> prvs=xxxxxxxxxx=userx@test.ex +> prvs=xxxxxxxxxx=userx@test.ex > > # Syntax errors > |