ph10 2007/06/14 14:20:38 BST
Modified files:
exim-test runtest
exim-test/stdout 0002
Log:
Update tests for new prvs format; update version number.
Revision Changes Path
1.27 +3 -2 exim/exim-test/runtest
1.15 +3 -3 exim/exim-test/stdout/0002
Index: runtest
===================================================================
RCS file: /home/cvs/exim/exim-test/runtest,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- runtest 17 Apr 2007 13:05:41 -0000 1.26
+++ runtest 14 Jun 2007 13:20:38 -0000 1.27
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
-# $Cambridge: exim/exim-test/runtest,v 1.26 2007/04/17 13:05:41 ph10 Exp $
+# $Cambridge: exim/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 @@
# 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 @@
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
Index: 0002
===================================================================
RCS file: /home/cvs/exim/exim-test/stdout/0002,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- 0002 8 May 2007 13:08:22 -0000 1.14
+++ 0002 14 Jun 2007 13:20:38 -0000 1.15
@@ -575,9 +575,9 @@
>
> # PRVS
>
-> prvs=userx/xxxxxxxxxx@???
-> prvs=userx/xxxxxxxxxx@???
-> prvs=userx/xxxxxxxxxx@???
+> prvs=xxxxxxxxxx=userx@???
+> prvs=xxxxxxxxxx=userx@???
+> prvs=xxxxxxxxxx=userx@???
>
> # Syntax errors
>
