[exim-cvs] cvs commit: exim/exim-test runtest exim/exim-test…

Top Page
Delete this message
Reply to this message
Author: John Jetmore
Date:  
To: exim-cvs
Subject: [exim-cvs] cvs commit: exim/exim-test runtest exim/exim-test/stderr 0403 exim/exim-test/stdout 0190 0244 0297 0350 0430
jetmore 2010/06/05 02:58:40 BST

  Modified files:
    exim-test            runtest 
    exim-test/stderr     0403 
    exim-test/stdout     0190 0244 0297 0350 0430 
  Log:
  runtest - trim trailing whitespace from otherwise un-rewritten host lines in munge function
  0190, 0244, 0297, 0350, 0430 - standardize trailing whitespace
  0403 - lingering header order fix, fix change in lookup type encoding after dkim lookup type removal


  Revision  Changes    Path
  1.35      +5 -1      exim/exim-test/runtest
  1.5       +3 -3      exim/exim-test/stderr/0403
  1.3       +9 -9      exim/exim-test/stdout/0190
  1.2       +1 -1      exim/exim-test/stdout/0244
  1.2       +4 -4      exim/exim-test/stdout/0297
  1.2       +1 -1      exim/exim-test/stdout/0350
  1.6       +1 -1      exim/exim-test/stdout/0430


  Index: runtest
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/runtest,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- runtest    3 Jun 2010 02:42:19 -0000    1.34
  +++ runtest    5 Jun 2010 01:58:39 -0000    1.35
  @@ -1,6 +1,6 @@
   #! /usr/bin/perl -w


-# $Cambridge: exim/exim-test/runtest,v 1.34 2010/06/03 02:42:19 jetmore Exp $
+# $Cambridge: exim/exim-test/runtest,v 1.35 2010/06/05 01:58:39 jetmore Exp $

###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
@@ -25,7 +25,7 @@

$testversion = "4.72 (02-Jun-10)";

  -$cf = "bin/cf";
  +$cf = "bin/cf -exact";
   $cr = "\r";
   $debug = 0;
   $force_update = 0;
  @@ -548,6 +548,9 @@
     # The amount of space between "host" and the address in verification output
     # depends on the length of the host name. We therefore reduce it to one space
     # for all of them.
  +  # Also, the length of space at the end of the host line is dependent
  +  # on the length of the longest line, so strip it also on otherwise
  +  # un-rewritten lines like localhost


     s/^\s+host\s(\S+)\s+(\S+)/  host $1 $2/;
     s/^\s+(host\s\S+\s\S+)\s+(port=.*)/  host $1 $2/;
  @@ -558,6 +561,7 @@
     s/\b\Q$parm_ipv6\E\b/ip6:ip6:ip6:ip6:ip6:ip6:ip6:ip6/g;
     s/\b\Q$parm_ipv4r\E\b/ip4-reverse/g;
     s/\b\Q$parm_ipv6r\E\b/ip6-reverse/g;
  +  s/^(\s+host\s\S+\s+\[\S+\]) +$/$1 /;



     # ======== Test network IP addresses ========


  Index: 0403
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stderr/0403,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- 0403    23 Nov 2009 13:04:56 -0000    1.4
  +++ 0403    5 Jun 2010 01:58:40 -0000    1.5
  @@ -20,9 +20,9 @@
     From: CALLER_NAME <CALLER@???>
   search_tidyup called
   >>Headers after rewriting and local additions:
  -  Date: Tue, 2 Mar 1999 09:44:33 +0000
   I Message-Id: <E10HmaX-0005vi-00@???>
   F From: CALLER_NAME <CALLER@???>
  +  Date: Tue, 2 Mar 1999 09:44:33 +0000


   Data file written for message 10HmaX-0005vi-00
   >>Generated Received: header line
  @@ -80,7 +80,7 @@
   search_find: file="TESTSUITE/aux-fixed/0403.data"
     key="test.ex" partial=-1 affix=NULL starflags=0
   LRU list:
  -  ;TESTSUITE/aux-fixed/0403.data
  +  :TESTSUITE/aux-fixed/0403.data
     End
   internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
     type=lsearch key="test.ex"
  @@ -94,7 +94,7 @@
   search_find: file="TESTSUITE/aux-fixed/0403.data"
     key="userx" partial=-1 affix=NULL starflags=0
   LRU list:
  -  ;TESTSUITE/aux-fixed/0403.data
  +  :TESTSUITE/aux-fixed/0403.data
     End
   internal_search_find: file="TESTSUITE/aux-fixed/0403.data"
     type=lsearch key="userx"


  Index: 0190
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0190,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- 0190    23 Nov 2009 13:04:59 -0000    1.2
  +++ 0190    5 Jun 2010 01:58:40 -0000    1.3
  @@ -97,17 +97,17 @@
   userx@bdomain1
     router = r3, transport = smtp2
     host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
  -  host 127.0.0.1 [127.0.0.1]      
  +  host 127.0.0.1 [127.0.0.1] 
     host the.local.host.name [ip4.ip4.ip4.ip4] 
   userx@bdomain2
     router = r3, transport = smtp2
     host the.local.host.name [ip4.ip4.ip4.ip4] 
  -  host 127.0.0.1 [127.0.0.1]      
  +  host 127.0.0.1 [127.0.0.1] 
     host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
   userx@bdomain3
     router = r3, transport = smtp2
     host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4] 
  -  host 127.0.0.1 [127.0.0.1]      
  +  host 127.0.0.1 [127.0.0.1] 
     host the.local.host.name [ip4.ip4.ip4.ip4] 


   ******** SERVER ********
  @@ -126,9 +126,9 @@
   Received: from CALLER by the.local.host.name with local (Exim x.yz)
       (envelope-from <CALLER@???>)
       id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
  -Date: Tue, 2 Mar 1999 09:44:33 +0000
   Message-Id: <E10HmaX-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  +Date: Tue, 2 Mar 1999 09:44:33 +0000


   Test message
   .
  @@ -151,9 +151,9 @@
   Received: from CALLER by the.local.host.name with local (Exim x.yz)
       (envelope-from <CALLER@???>)
       id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
  -Date: Tue, 2 Mar 1999 09:44:33 +0000
   Message-Id: <E10HmaX-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  +Date: Tue, 2 Mar 1999 09:44:33 +0000


   Test message
   .
  @@ -176,9 +176,9 @@
   Received: from CALLER by the.local.host.name with local (Exim x.yz)
       (envelope-from <CALLER@???>)
       id 10HmaX-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
  -Date: Tue, 2 Mar 1999 09:44:33 +0000
   Message-Id: <E10HmaX-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  +Date: Tue, 2 Mar 1999 09:44:33 +0000


   Test message
   .
  @@ -203,9 +203,9 @@
   Received: from CALLER by the.local.host.name with local (Exim x.yz)
       (envelope-from <CALLER@???>)
       id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
  -Date: Tue, 2 Mar 1999 09:44:33 +0000
   Message-Id: <E10HmaY-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  +Date: Tue, 2 Mar 1999 09:44:33 +0000


   Test message
   .
  @@ -228,9 +228,9 @@
   Received: from CALLER by the.local.host.name with local (Exim x.yz)
       (envelope-from <CALLER@???>)
       id 10HmaY-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
  -Date: Tue, 2 Mar 1999 09:44:33 +0000
   Message-Id: <E10HmaY-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  +Date: Tue, 2 Mar 1999 09:44:33 +0000


   Test message
   .
  @@ -257,9 +257,9 @@
   Received: from CALLER by the.local.host.name with local (Exim x.yz)
       (envelope-from <CALLER@???>)
       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
  -Date: Tue, 2 Mar 1999 09:44:33 +0000
   Message-Id: <E10HmaZ-0005vi-00@???>
   From: CALLER_NAME <CALLER@???>
  +Date: Tue, 2 Mar 1999 09:44:33 +0000


Test message
.

  Index: 0244
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0244,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0244    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0244    5 Jun 2010 01:58:40 -0000    1.2
  @@ -2,4 +2,4 @@
   > OK
   > OK
   > OK
  -> 
  \ No newline at end of file
  +> 


  Index: 0297
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0297,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0297    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0297    5 Jun 2010 01:58:40 -0000    1.2
  @@ -1,8 +1,8 @@
  -/a/b/c@??? -> /a/b/c 
  +/a/b/c@??? -> /a/b/c
     transport = tf1
  -/x/y/z@??? -> /x/y/z 
  +/x/y/z@??? -> /x/y/z
     transport = tf2
  -/a/b/c/@??? -> /a/b/c/ 
  +/a/b/c/@??? -> /a/b/c/
     transport = td1
  -/a/a/b//@??? -> /a/a/b// 
  +/a/a/b//@??? -> /a/a/b//
     transport = td2


  Index: 0350
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0350,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 0350    7 Feb 2006 10:47:37 -0000    1.1
  +++ 0350    5 Jun 2010 01:58:40 -0000    1.2
  @@ -1,4 +1,4 @@
   xx@yy
     router = r1, transport = t1
  -  host 1.2.3.4 [1.2.3.4]    
  +  host 1.2.3.4 [1.2.3.4] 
     host other2.test.ex [V4NET.12.3.2] 


  Index: 0430
  ===================================================================
  RCS file: /home/cvs/exim/exim-test/stdout/0430,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- 0430    14 Mar 2007 11:22:23 -0000    1.5
  +++ 0430    5 Jun 2010 01:58:40 -0000    1.6
  @@ -48,7 +48,7 @@
     router = r1, transport = t1
     host ten-1.test.ex [V4NET.0.0.1] MX=5
     host eximtesthost.test.ex [ip4.ip4.ip4.ip4] MX=5
  -  host ten-6.test.ex [V4NET.0.0.6]      
  +  host ten-6.test.ex [V4NET.0.0.6] 
   x@??? is undeliverable: lowest numbered MX record points to local host
   x@??? cannot be resolved at this time: lookup of host "localhost.test.ex" failed in r2 router
   x@???