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

Góra strony
Delete this message
Reply to this message
Autor: Philip Hazel
Data:  
Dla: exim-cvs
Temat: [exim-cvs] cvs commit: exim/exim-test-orig/AutoTest runtest exim/exim-test-orig/AutoTest/aux 167.F 176.filter 444.F 444.f aliases exim/exim-test-orig/AutoTest/log 024 052 167 168 176 444 exim/exim
ph10 2004/10/14 12:16:36 BST

  Modified files:
    exim-test-orig/AutoTest runtest 
    exim-test-orig/AutoTest/aux 167.F 176.filter 444.F 444.f 
                                aliases 
    exim-test-orig/AutoTest/log 024 052 167 168 176 444 
    exim-test-orig/AutoTest/mail 024.ph10 167.ph10 168.ph10 
                                 444.ph10 
    exim-test-orig/AutoTest/msglog 052.10HmaX-0005vi-00 
    exim-test-orig/AutoTest/scripts 082 565 
    exim-test-orig/AutoTest/stderr 117 565 
    exim-test-orig/AutoTest/stdout 082 
  Log:
  Fix up the script and some of the data consequent on putting all these files
  into the CVS repository, which involved some re-arrangement.


  Revision  Changes    Path
  1.2       +1 -1      exim/exim-test-orig/AutoTest/aux/167.F
  1.2       +1 -1      exim/exim-test-orig/AutoTest/aux/176.filter
  1.2       +2 -2      exim/exim-test-orig/AutoTest/aux/444.F
  1.2       +1 -1      exim/exim-test-orig/AutoTest/aux/444.f
  1.2       +1 -1      exim/exim-test-orig/AutoTest/aux/aliases
  1.2       +15 -15    exim/exim-test-orig/AutoTest/log/024
  1.2       +1 -1      exim/exim-test-orig/AutoTest/log/052
  1.2       +4 -4      exim/exim-test-orig/AutoTest/log/167
  1.2       +4 -4      exim/exim-test-orig/AutoTest/log/168
  1.2       +2 -2      exim/exim-test-orig/AutoTest/log/176
  1.2       +6 -6      exim/exim-test-orig/AutoTest/log/444
  1.2       +10 -10    exim/exim-test-orig/AutoTest/mail/024.ph10
  1.2       +4 -4      exim/exim-test-orig/AutoTest/mail/167.ph10
  1.2       +4 -4      exim/exim-test-orig/AutoTest/mail/168.ph10
  1.2       +6 -6      exim/exim-test-orig/AutoTest/mail/444.ph10
  1.2       +1 -1      exim/exim-test-orig/AutoTest/msglog/052.10HmaX-0005vi-00
  1.2       +2 -1      exim/exim-test-orig/AutoTest/runtest
  1.2       +1 -1      exim/exim-test-orig/AutoTest/scripts/082
  1.2       +7 -7      exim/exim-test-orig/AutoTest/scripts/565
  1.2       +72 -72    exim/exim-test-orig/AutoTest/stderr/117
  1.2       +39 -39    exim/exim-test-orig/AutoTest/stderr/565
  1.2       +1 -1      exim/exim-test-orig/AutoTest/stdout/082


  Index: runtest
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/runtest,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- runtest    8 Oct 2004 14:49:15 -0000    1.1
  +++ runtest    14 Oct 2004 11:16:36 -0000    1.2
  @@ -1,4 +1,5 @@
   #! /bin/sh
  +# $Cambridge: exim/exim-test-orig/AutoTest/runtest,v 1.2 2004/10/14 11:16:36 ph10 Exp $


# A script to run some automatic testing of Exim. This has been needed for
# quite some time. I am finally thinking about it in February 1999.
@@ -739,7 +740,7 @@

   foreach $mail (@oldmails)
     {
  -  next if $mail eq "." || $mail eq ".."; 
  +  next if $mail eq "." || $mail eq ".." || $mail eq "CVS"; 
     if (-d "mail/$mail")
       {
       opendir(DIR, "mail/$mail") || die "Failed to opendir mail/$mail: $!\n";


  Index: 167.F
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/aux/167.F,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 167.F    8 Oct 2004 14:04:55 -0000    1.1
  +++ 167.F    14 Oct 2004 11:16:36 -0000    1.2
  @@ -1,3 +1,3 @@
   if $recipients contains pipe then
  -  pipe "/source/exim4/AutoTest/aux/showenv $recipients"
  +  pipe "/source/exim4/AutoTest/showenv $recipients"
   endif   


  Index: 176.filter
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/aux/176.filter,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 176.filter    8 Oct 2004 14:04:55 -0000    1.1
  +++ 176.filter    14 Oct 2004 11:16:36 -0000    1.2
  @@ -3,5 +3,5 @@
   if error_message then finish endif


if $received_protocol is not scanned-ok then
- pipe "/source/exim4/AutoTest/aux/resubmit $sender_address $recipients 176"
+ pipe "/source/exim4/AutoTest/resubmit $sender_address $recipients 176"
endif

  Index: 444.F
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/aux/444.F,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 444.F    8 Oct 2004 14:04:55 -0000    1.1
  +++ 444.F    14 Oct 2004 11:16:36 -0000    1.2
  @@ -3,11 +3,11 @@
   if error_message then finish endif


   if foranyaddress $h_to: ($thisaddress matches "^(alice)") then
  -  pipe "/source/exim4/AutoTest/aux/showenv $thisaddress $1"
  +  pipe "/source/exim4/AutoTest/showenv $thisaddress $1"
     finish
   endif   


if $h_to: matches "^(j..)" then
- pipe "/source/exim4/AutoTest/aux/showenv $1"
+ pipe "/source/exim4/AutoTest/showenv $1"
endif


  Index: 444.f
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/aux/444.f,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 444.f    8 Oct 2004 14:04:55 -0000    1.1
  +++ 444.f    14 Oct 2004 11:16:36 -0000    1.2
  @@ -3,6 +3,6 @@
   if error_message then finish endif


if foranyaddress $h_to: ($thisaddress matches "^(...)") then
- pipe "/source/exim4/AutoTest/aux/showenv $thisaddress $1"
+ pipe "/source/exim4/AutoTest/showenv $thisaddress $1"
endif


  Index: aliases
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/aux/aliases,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- aliases    8 Oct 2004 14:04:55 -0000    1.1
  +++ aliases    14 Oct 2004 11:16:36 -0000    1.2
  @@ -4,6 +4,6 @@
   devnull:    /dev/null
   fail:       :fail: this alias is forced to fail
   list:       ph10, mug99
  -pipe:       |/source/exim4/AutoTest/aux/showenv
  +pipe:       |/source/exim4/AutoTest/showenv
   postmaster: ph10
   root:       ph10


  Index: 024
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/024,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 024    8 Oct 2004 14:49:31 -0000    1.1
  +++ 024    14 Oct 2004 11:16:36 -0000    1.2
  @@ -1,35 +1,35 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=284
  -1999-03-02 09:44:33 10HmaX-0005vi-00 <|/source/exim4/AutoTest/aux/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv <pipe@???> R=system_aliases T=address_pipe: return message generated
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2095
  +1999-03-02 09:44:33 10HmaX-0005vi-00 <|/source/exim4/AutoTest/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/showenv <pipe@???> R=system_aliases T=address_pipe: return message generated
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2087
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=279
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 <|/source/exim4/AutoTest/aux/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv <prefixed+pipe@???> R=system_aliases T=address_pipe: return message generated
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2130
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 <|/source/exim4/AutoTest/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/showenv <prefixed+pipe@???> R=system_aliases T=address_pipe: return message generated
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2122
   1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=279
  -1999-03-02 09:44:33 10HmbB-0005vi-00 <|/source/exim4/AutoTest/aux/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
  -1999-03-02 09:44:33 10HmbB-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv <pipe-suffixed@???> R=system_aliases T=address_pipe: return message generated
  -1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=2130
  +1999-03-02 09:44:33 10HmbB-0005vi-00 <|/source/exim4/AutoTest/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
  +1999-03-02 09:44:33 10HmbB-0005vi-00 ** |/source/exim4/AutoTest/showenv <pipe-suffixed@???> R=system_aliases T=address_pipe: return message generated
  +1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=2122
   1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbD-0005vi-00 <= ph10@??? U=ph10 P=local S=288
  -1999-03-02 09:44:33 10HmbD-0005vi-00 <|/source/exim4/AutoTest/aux/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
  -1999-03-02 09:44:33 10HmbD-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv <prefixed+pipe-suffixed@???> R=system_aliases T=address_pipe: return message generated
  -1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=2193
  +1999-03-02 09:44:33 10HmbD-0005vi-00 <|/source/exim4/AutoTest/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
  +1999-03-02 09:44:33 10HmbD-0005vi-00 ** |/source/exim4/AutoTest/showenv <prefixed+pipe-suffixed@???> R=system_aliases T=address_pipe: return message generated
  +1999-03-02 09:44:33 10HmbE-0005vi-00 <= <> R=10HmbD-0005vi-00 U=exim P=local S=2185
   1999-03-02 09:44:33 10HmbE-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbE-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbD-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbF-0005vi-00 <= ph10@??? U=ph10 P=local S=284
  -1999-03-02 09:44:33 10HmbF-0005vi-00 <|/source/exim4/AutoTest/aux/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
  -1999-03-02 09:44:33 10HmbF-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv <pipe@???> R=system_aliases T=address_pipe: return message generated
  -1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=exim P=local S=2095
  +1999-03-02 09:44:33 10HmbF-0005vi-00 <|/source/exim4/AutoTest/showenv>: address_pipe transport output: Test pipe script - umask, uid, gid are:
  +1999-03-02 09:44:33 10HmbF-0005vi-00 ** |/source/exim4/AutoTest/showenv <pipe@???> R=system_aliases T=address_pipe: return message generated
  +1999-03-02 09:44:33 10HmbG-0005vi-00 <= <> R=10HmbF-0005vi-00 U=exim P=local S=2087
   1999-03-02 09:44:33 10HmbG-0005vi-00 => ph10 <ph10@???> R=localuser T=local_delivery
   1999-03-02 09:44:33 10HmbG-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbF-0005vi-00 Completed


  Index: 052
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/052,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 052    8 Oct 2004 14:49:31 -0000    1.1
  +++ 052    14 Oct 2004 11:16:36 -0000    1.2
  @@ -1,2 +1,2 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=310
  -1999-03-02 09:44:33 10HmaX-0005vi-00 == |/source/exim4/AutoTest/aux/showenv <pipe@???> R=system_aliases defer (-30): pipe_transport unset in system_aliases router
  +1999-03-02 09:44:33 10HmaX-0005vi-00 == |/source/exim4/AutoTest/showenv <pipe@???> R=system_aliases defer (-30): pipe_transport unset in system_aliases router


  Index: 167
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/167,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 167    8 Oct 2004 14:49:31 -0000    1.1
  +++ 167    14 Oct 2004 11:16:36 -0000    1.2
  @@ -1,14 +1,14 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=265
   1999-03-02 09:44:33 10HmaX-0005vi-00 original recipients ignored (system filter)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv $recipients <system-filter> T=address_pipe: return message generated
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2115
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/showenv $recipients <system-filter> T=address_pipe: return message generated
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2107
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=user T=local_delivery
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=247
   1999-03-02 09:44:33 10HmaZ-0005vi-00 original recipients ignored (system filter)
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv $recipients <system-filter> T=address_pipe: return message generated
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2113
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/showenv $recipients <system-filter> T=address_pipe: return message generated
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2105
   1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=user T=local_delivery
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed


  Index: 168
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/168,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 168    8 Oct 2004 14:49:31 -0000    1.1
  +++ 168    14 Oct 2004 11:16:36 -0000    1.2
  @@ -1,14 +1,14 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=265
   1999-03-02 09:44:33 10HmaX-0005vi-00 original recipients ignored (system filter)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv $recipients <system-filter> T=address_pipe: return message generated
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2115
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/showenv $recipients <system-filter> T=address_pipe: return message generated
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2107
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=user T=local_delivery
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=247
   1999-03-02 09:44:33 10HmaZ-0005vi-00 original recipients ignored (system filter)
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv $recipients <system-filter> T=address_pipe: return message generated
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2117
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/showenv $recipients <system-filter> T=address_pipe: return message generated
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2109
   1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=user T=local_delivery
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed


  Index: 176
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/176,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 176    8 Oct 2004 14:49:31 -0000    1.1
  +++ 176    14 Oct 2004 11:16:36 -0000    1.2
  @@ -3,7 +3,7 @@
   1999-03-02 09:44:33 10HmaY-0005vi-00 <= ph10@??? U=ph10 P=scanned-ok S=423 id=E10HmaX-0005vi-00@???
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=all T=appendfile
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmaX-0005vi-00 => |/source/exim4/AutoTest/aux/resubmit $sender_address $recipients 176 <system-filter> T=pipe
  +1999-03-02 09:44:33 10HmaX-0005vi-00 => |/source/exim4/AutoTest/resubmit $sender_address $recipients 176 <system-filter> T=pipe
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=268
   1999-03-02 09:44:33 10HmaZ-0005vi-00 original recipients ignored (system filter)
  @@ -12,5 +12,5 @@
   1999-03-02 09:44:33 10HmbA-0005vi-00 => mug99 <mug99@???> R=all T=appendfile
   1999-03-02 09:44:33 10HmbA-0005vi-00 => root <root@???> R=all T=appendfile
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 => |/source/exim4/AutoTest/aux/resubmit $sender_address $recipients 176 <system-filter> T=pipe
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 => |/source/exim4/AutoTest/resubmit $sender_address $recipients 176 <system-filter> T=pipe
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed


  Index: 444
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/log/444,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 444    8 Oct 2004 14:49:31 -0000    1.1
  +++ 444    14 Oct 2004 11:16:36 -0000    1.2
  @@ -1,20 +1,20 @@
   1999-03-02 09:44:33 10HmaX-0005vi-00 <= ph10@??? U=ph10 P=local S=272
   1999-03-02 09:44:33 10HmaX-0005vi-00 original recipients ignored (system filter)
  -1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv $thisaddress $1 <system-filter> T=t1: return message generated
  -1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2134
  +1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/source/exim4/AutoTest/showenv $thisaddress $1 <system-filter> T=t1: return message generated
  +1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=exim P=local S=2126
   1999-03-02 09:44:33 10HmaY-0005vi-00 => ph10 <ph10@???> R=r1 T=t2
   1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 <= ph10@??? U=ph10 P=local S=284
   1999-03-02 09:44:33 10HmaZ-0005vi-00 original recipients ignored (system filter)
  -1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv $1 <system-filter> T=t1: return message generated
  -1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2114
  +1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |/source/exim4/AutoTest/showenv $1 <system-filter> T=t1: return message generated
  +1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=exim P=local S=2106
   1999-03-02 09:44:33 10HmbA-0005vi-00 => ph10 <ph10@???> R=r1 T=t2
   1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
   1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbB-0005vi-00 <= ph10@??? U=ph10 P=local S=276
  -1999-03-02 09:44:33 10HmbB-0005vi-00 ** |/source/exim4/AutoTest/aux/showenv $thisaddress $1 <redking@???> R=r0 T=t1: return message generated
  -1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=2124
  +1999-03-02 09:44:33 10HmbB-0005vi-00 ** |/source/exim4/AutoTest/showenv $thisaddress $1 <redking@???> R=r0 T=t1: return message generated
  +1999-03-02 09:44:33 10HmbC-0005vi-00 <= <> R=10HmbB-0005vi-00 U=exim P=local S=2116
   1999-03-02 09:44:33 10HmbC-0005vi-00 => ph10 <ph10@???> R=r1 T=t2
   1999-03-02 09:44:33 10HmbC-0005vi-00 Completed
   1999-03-02 09:44:33 10HmbB-0005vi-00 Completed


  Index: 024.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/024.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 024.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 024.ph10    14 Oct 2004 11:16:36 -0000    1.2
  @@ -18,12 +18,12 @@
   A message that you sent could not be delivered to one or more of its
   recipients. This is a permanent error. The following address(es) failed:


  -  pipe to |/source/exim4/AutoTest/aux/showenv
  +  pipe to |/source/exim4/AutoTest/showenv
       generated by pipe@???


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv
  +------ pipe to |/source/exim4/AutoTest/showenv
          generated by pipe@??? ------


Test pipe script - umask, uid, gid are:
@@ -103,12 +103,12 @@
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  -  pipe to |/source/exim4/AutoTest/aux/showenv
  +  pipe to |/source/exim4/AutoTest/showenv
       generated by prefixed+pipe@???


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv
  +------ pipe to |/source/exim4/AutoTest/showenv
          generated by prefixed+pipe@??? ------


Test pipe script - umask, uid, gid are:
@@ -188,12 +188,12 @@
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  -  pipe to |/source/exim4/AutoTest/aux/showenv
  +  pipe to |/source/exim4/AutoTest/showenv
       generated by pipe-suffixed@???


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv
  +------ pipe to |/source/exim4/AutoTest/showenv
          generated by pipe-suffixed@??? ------


Test pipe script - umask, uid, gid are:
@@ -273,12 +273,12 @@
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  -  pipe to |/source/exim4/AutoTest/aux/showenv
  +  pipe to |/source/exim4/AutoTest/showenv
       generated by prefixed+pipe-suffixed@???


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv
  +------ pipe to |/source/exim4/AutoTest/showenv
          generated by prefixed+pipe-suffixed@??? ------


Test pipe script - umask, uid, gid are:
@@ -358,12 +358,12 @@
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  -  pipe to |/source/exim4/AutoTest/aux/showenv
  +  pipe to |/source/exim4/AutoTest/showenv
       generated by pipe@???


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv
  +------ pipe to |/source/exim4/AutoTest/showenv
          generated by pipe@??? ------


Test pipe script - umask, uid, gid are:

  Index: 167.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/167.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 167.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 167.ph10    14 Oct 2004 11:16:36 -0000    1.2
  @@ -15,12 +15,12 @@
   A message that you sent could not be delivered to one or more of its
   recipients. This is a permanent error. The following address(es) failed:


  -  pipe to |/source/exim4/AutoTest/aux/showenv $recipients
  +  pipe to |/source/exim4/AutoTest/showenv $recipients
       generated by system-filter


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv $recipients
  +------ pipe to |/source/exim4/AutoTest/showenv $recipients
          generated by system-filter ------


Test pipe script - umask, uid, gid are:
@@ -91,12 +91,12 @@
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  -  pipe to |/source/exim4/AutoTest/aux/showenv $recipients
  +  pipe to |/source/exim4/AutoTest/showenv $recipients
       generated by system-filter


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv $recipients
  +------ pipe to |/source/exim4/AutoTest/showenv $recipients
          generated by system-filter ------


Test pipe script - umask, uid, gid are:

  Index: 168.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/168.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 168.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 168.ph10    14 Oct 2004 11:16:36 -0000    1.2
  @@ -15,12 +15,12 @@
   A message that you sent could not be delivered to one or more of its
   recipients. This is a permanent error. The following address(es) failed:


  -  pipe to |/source/exim4/AutoTest/aux/showenv $recipients
  +  pipe to |/source/exim4/AutoTest/showenv $recipients
       generated by system-filter


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv $recipients
  +------ pipe to |/source/exim4/AutoTest/showenv $recipients
          generated by system-filter ------


Test pipe script - umask, uid, gid are:
@@ -91,12 +91,12 @@
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  -  pipe to |/source/exim4/AutoTest/aux/showenv $recipients
  +  pipe to |/source/exim4/AutoTest/showenv $recipients
       generated by system-filter


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv $recipients
  +------ pipe to |/source/exim4/AutoTest/showenv $recipients
          generated by system-filter ------


Test pipe script - umask, uid, gid are:

  Index: 444.ph10
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/mail/444.ph10,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 444.ph10    8 Oct 2004 14:49:42 -0000    1.1
  +++ 444.ph10    14 Oct 2004 11:16:36 -0000    1.2
  @@ -15,12 +15,12 @@
   A message that you sent could not be delivered to one or more of its
   recipients. This is a permanent error. The following address(es) failed:


  -  pipe to |/source/exim4/AutoTest/aux/showenv $thisaddress $1
  +  pipe to |/source/exim4/AutoTest/showenv $thisaddress $1
       generated by system-filter


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv $thisaddress $1
  +------ pipe to |/source/exim4/AutoTest/showenv $thisaddress $1
          generated by system-filter ------


Test pipe script - umask, uid, gid are:
@@ -94,12 +94,12 @@
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  -  pipe to |/source/exim4/AutoTest/aux/showenv $1
  +  pipe to |/source/exim4/AutoTest/showenv $1
       generated by system-filter


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv $1
  +------ pipe to |/source/exim4/AutoTest/showenv $1
          generated by system-filter ------


Test pipe script - umask, uid, gid are:
@@ -172,12 +172,12 @@
A message that you sent could not be delivered to one or more of its
recipients. This is a permanent error. The following address(es) failed:

  -  pipe to |/source/exim4/AutoTest/aux/showenv $thisaddress $1
  +  pipe to |/source/exim4/AutoTest/showenv $thisaddress $1
       generated by redking@???


The following text was generated during the delivery attempt:

  ------- pipe to |/source/exim4/AutoTest/aux/showenv $thisaddress $1
  +------ pipe to |/source/exim4/AutoTest/showenv $thisaddress $1
          generated by redking@??? ------


Test pipe script - umask, uid, gid are:

  Index: 052.10HmaX-0005vi-00
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/msglog/052.10HmaX-0005vi-00,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 052.10HmaX-0005vi-00    8 Oct 2004 14:49:49 -0000    1.1
  +++ 052.10HmaX-0005vi-00    14 Oct 2004 11:16:36 -0000    1.2
  @@ -1,2 +1,2 @@
   1999-03-02 09:44:33 Received from ph10@??? U=ph10 P=local S=310
  -1999-03-02 09:44:33 |/source/exim4/AutoTest/aux/showenv <pipe@???> R=system_aliases defer (-30): pipe_transport unset in system_aliases router
  +1999-03-02 09:44:33 |/source/exim4/AutoTest/showenv <pipe@???> R=system_aliases defer (-30): pipe_transport unset in system_aliases router


  Index: 082
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/082,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 082    8 Oct 2004 14:49:52 -0000    1.1
  +++ 082    14 Oct 2004 11:16:36 -0000    1.2
  @@ -296,7 +296,7 @@
   ${lookup{first}cdb{DIR/aux/082.cdb}{$value}fail}
   ${lookup{fail}cdb{DIR/aux/082.cdb}{$value}{failure value}}
   ${lookup{fail}cdb{DIR/aux/082.cdb}{$value}fail}
  -${lookup{postmaster}lsearch{DIR/aliases}{$value}fail}
  +${lookup{postmaster}lsearch{DIR/aux/aliases}{$value}fail}
   ${lookup{second}cdb{DIR/aux/082.cdb}{$value}fail}
   ${extract{A}{${lookup{second}cdb{DIR/aux/082.cdb}{$value}fail}}}
   ${extract{B}{${lookup{second}cdb{DIR/aux/082.cdb}{$value}fail}}}


  Index: 565
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/scripts/565,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 565    8 Oct 2004 14:49:53 -0000    1.1
  +++ 565    14 Oct 2004 11:16:36 -0000    1.2
  @@ -1,16 +1,16 @@
   0 lookup caching all
   exim -d -be
  -${lookup{list}lsearch{DIR/aliases}{$value}{NOT FOUND}}
  -${lookup{list}lsearch{DIR/aliases}{$value}{NOT FOUND}}
  -${lookup{root}lsearch{DIR/aliases}{$value}{NOT FOUND}}
  -${lookup{root}lsearch{DIR/aliases}{$value}{NOT FOUND}}
  -${lookup{list}lsearch{DIR/aliases}{$value}{NOT FOUND}}
  +${lookup{list}lsearch{DIR/aux/aliases}{$value}{NOT FOUND}}
  +${lookup{list}lsearch{DIR/aux/aliases}{$value}{NOT FOUND}}
  +${lookup{root}lsearch{DIR/aux/aliases}{$value}{NOT FOUND}}
  +${lookup{root}lsearch{DIR/aux/aliases}{$value}{NOT FOUND}}
  +${lookup{list}lsearch{DIR/aux/aliases}{$value}{NOT FOUND}}


${lookup testdb {something}{$value}{NOT FOUND}}
${lookup testdb {something}{$value}{NOT FOUND}}
${lookup testdb {nocache}{$value}{NOT FOUND}}
${lookup testdb {something}{$value}{NOT FOUND}}

-${lookup{list}lsearch{DIR/aliases}{$value}{NOT FOUND}}
-${lookup{root}lsearch{DIR/aliases}{$value}{NOT FOUND}}
+${lookup{list}lsearch{DIR/aux/aliases}{$value}{NOT FOUND}}
+${lookup{root}lsearch{DIR/aux/aliases}{$value}{NOT FOUND}}
****

  Index: 117
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/117,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 117    8 Oct 2004 14:50:08 -0000    1.1
  +++ 117    14 Oct 2004 11:16:36 -0000    1.2
  @@ -25,17 +25,17 @@
   --------> l1 router <--------
   local_part=x domain=test.ex
   calling l1 router
  -rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aliases}}
  -search_open: lsearch "/source/exim4/AutoTest/aliases"
  -search_find: file="/source/exim4/AutoTest/aliases"
  +rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aux/aliases}}
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases"
  +search_find: file="/source/exim4/AutoTest/aux/aliases"
     key="x" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases"
     type=lsearch key="x"
   file lookup required for x
  -  in /source/exim4/AutoTest/aliases
  +  in /source/exim4/AutoTest/aux/aliases
   lookup failed
   expanded: 
   file is not a filter file
  @@ -44,18 +44,18 @@
   --------> l2 router <--------
   local_part=x domain=test.ex
   calling l2 router
  -rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aliases.dom}}
  -search_open: lsearch "/source/exim4/AutoTest/aliases.dom"
  -search_find: file="/source/exim4/AutoTest/aliases.dom"
  +rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aux/aliases.dom}}
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases.dom"
  +search_find: file="/source/exim4/AutoTest/aux/aliases.dom"
     key="x" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases.dom
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases.dom
  +  :/source/exim4/AutoTest/aux/aliases
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases.dom"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases.dom"
     type=lsearch key="x"
   file lookup required for x
  -  in /source/exim4/AutoTest/aliases.dom
  +  in /source/exim4/AutoTest/aux/aliases.dom
   lookup failed
   expanded: 
   file is not a filter file
  @@ -64,20 +64,20 @@
   --------> l3 router <--------
   local_part=x domain=test.ex
   calling l3 router
  -rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aliases.other}}
  -search_open: lsearch "/source/exim4/AutoTest/aliases.other"
  +rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aux/aliases.other}}
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases.other"
   Too many lookup files open
  -  closing :/source/exim4/AutoTest/aliases
  -search_find: file="/source/exim4/AutoTest/aliases.other"
  +  closing :/source/exim4/AutoTest/aux/aliases
  +search_find: file="/source/exim4/AutoTest/aux/aliases.other"
     key="x" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases.other
  -  :/source/exim4/AutoTest/aliases.dom
  +  :/source/exim4/AutoTest/aux/aliases.other
  +  :/source/exim4/AutoTest/aux/aliases.dom
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases.other"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases.other"
     type=lsearch key="x"
   file lookup required for x
  -  in /source/exim4/AutoTest/aliases.other
  +  in /source/exim4/AutoTest/aux/aliases.other
   lookup failed
   expanded: 
   file is not a filter file
  @@ -89,12 +89,12 @@
   rda_interpret (string): ${lookup{$local_part}cdb{/source/exim4/AutoTest/aux/117.cdb1}}
   search_open: cdb "/source/exim4/AutoTest/aux/117.cdb1"
   Too many lookup files open
  -  closing :/source/exim4/AutoTest/aliases.dom
  +  closing :/source/exim4/AutoTest/aux/aliases.dom
   search_find: file="/source/exim4/AutoTest/aux/117.cdb1"
     key="x" partial=-1 affix=NULL starflags=0
   LRU list:
     0/source/exim4/AutoTest/aux/117.cdb1
  -  :/source/exim4/AutoTest/aliases.other
  +  :/source/exim4/AutoTest/aux/aliases.other
     End
   internal_search_find: file="/source/exim4/AutoTest/aux/117.cdb1"
     type=cdb key="x"
  @@ -111,7 +111,7 @@
   rda_interpret (string): ${lookup{$local_part}cdb{/source/exim4/AutoTest/aux/117.cdb2}}
   search_open: cdb "/source/exim4/AutoTest/aux/117.cdb2"
   Too many lookup files open
  -  closing :/source/exim4/AutoTest/aliases.other
  +  closing :/source/exim4/AutoTest/aux/aliases.other
   search_find: file="/source/exim4/AutoTest/aux/117.cdb2"
     key="x" partial=-1 affix=NULL starflags=0
   LRU list:
  @@ -165,21 +165,21 @@
   --------> l1 router <--------
   local_part=y domain=test.ex
   calling l1 router
  -rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aliases}}
  -search_open: lsearch "/source/exim4/AutoTest/aliases"
  +rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aux/aliases}}
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases"
     cached closed
   Too many lookup files open
     closing 0/source/exim4/AutoTest/aux/117.cdb2
  -search_find: file="/source/exim4/AutoTest/aliases"
  +search_find: file="/source/exim4/AutoTest/aux/aliases"
     key="y" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     0/source/exim4/AutoTest/aux/117.cdb3
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases"
     type=lsearch key="y"
   file lookup required for y
  -  in /source/exim4/AutoTest/aliases
  +  in /source/exim4/AutoTest/aux/aliases
   lookup failed
   expanded: 
   file is not a filter file
  @@ -188,21 +188,21 @@
   --------> l2 router <--------
   local_part=y domain=test.ex
   calling l2 router
  -rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aliases.dom}}
  -search_open: lsearch "/source/exim4/AutoTest/aliases.dom"
  +rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aux/aliases.dom}}
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases.dom"
     cached closed
   Too many lookup files open
     closing 0/source/exim4/AutoTest/aux/117.cdb3
  -search_find: file="/source/exim4/AutoTest/aliases.dom"
  +search_find: file="/source/exim4/AutoTest/aux/aliases.dom"
     key="y" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases.dom
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases.dom
  +  :/source/exim4/AutoTest/aux/aliases
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases.dom"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases.dom"
     type=lsearch key="y"
   file lookup required for y
  -  in /source/exim4/AutoTest/aliases.dom
  +  in /source/exim4/AutoTest/aux/aliases.dom
   lookup failed
   expanded: 
   file is not a filter file
  @@ -211,21 +211,21 @@
   --------> l3 router <--------
   local_part=y domain=test.ex
   calling l3 router
  -rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aliases.other}}
  -search_open: lsearch "/source/exim4/AutoTest/aliases.other"
  +rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aux/aliases.other}}
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases.other"
     cached closed
   Too many lookup files open
  -  closing :/source/exim4/AutoTest/aliases
  -search_find: file="/source/exim4/AutoTest/aliases.other"
  +  closing :/source/exim4/AutoTest/aux/aliases
  +search_find: file="/source/exim4/AutoTest/aux/aliases.other"
     key="y" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases.other
  -  :/source/exim4/AutoTest/aliases.dom
  +  :/source/exim4/AutoTest/aux/aliases.other
  +  :/source/exim4/AutoTest/aux/aliases.dom
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases.other"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases.other"
     type=lsearch key="y"
   file lookup required for y
  -  in /source/exim4/AutoTest/aliases.other
  +  in /source/exim4/AutoTest/aux/aliases.other
   lookup failed
   expanded: 
   file is not a filter file
  @@ -238,12 +238,12 @@
   search_open: cdb "/source/exim4/AutoTest/aux/117.cdb1"
     cached closed
   Too many lookup files open
  -  closing :/source/exim4/AutoTest/aliases.dom
  +  closing :/source/exim4/AutoTest/aux/aliases.dom
   search_find: file="/source/exim4/AutoTest/aux/117.cdb1"
     key="y" partial=-1 affix=NULL starflags=0
   LRU list:
     0/source/exim4/AutoTest/aux/117.cdb1
  -  :/source/exim4/AutoTest/aliases.other
  +  :/source/exim4/AutoTest/aux/aliases.other
     End
   internal_search_find: file="/source/exim4/AutoTest/aux/117.cdb1"
     type=cdb key="y"
  @@ -261,7 +261,7 @@
   search_open: cdb "/source/exim4/AutoTest/aux/117.cdb2"
     cached closed
   Too many lookup files open
  -  closing :/source/exim4/AutoTest/aliases.other
  +  closing :/source/exim4/AutoTest/aux/aliases.other
   search_find: file="/source/exim4/AutoTest/aux/117.cdb2"
     key="y" partial=-1 affix=NULL starflags=0
   LRU list:
  @@ -316,21 +316,21 @@
   --------> l1 router <--------
   local_part=z domain=test.ex
   calling l1 router
  -rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aliases}}
  -search_open: lsearch "/source/exim4/AutoTest/aliases"
  +rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aux/aliases}}
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases"
     cached closed
   Too many lookup files open
     closing 0/source/exim4/AutoTest/aux/117.cdb2
  -search_find: file="/source/exim4/AutoTest/aliases"
  +search_find: file="/source/exim4/AutoTest/aux/aliases"
     key="z" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     0/source/exim4/AutoTest/aux/117.cdb3
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases"
     type=lsearch key="z"
   file lookup required for z
  -  in /source/exim4/AutoTest/aliases
  +  in /source/exim4/AutoTest/aux/aliases
   lookup failed
   expanded: 
   file is not a filter file
  @@ -339,21 +339,21 @@
   --------> l2 router <--------
   local_part=z domain=test.ex
   calling l2 router
  -rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aliases.dom}}
  -search_open: lsearch "/source/exim4/AutoTest/aliases.dom"
  +rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aux/aliases.dom}}
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases.dom"
     cached closed
   Too many lookup files open
     closing 0/source/exim4/AutoTest/aux/117.cdb3
  -search_find: file="/source/exim4/AutoTest/aliases.dom"
  +search_find: file="/source/exim4/AutoTest/aux/aliases.dom"
     key="z" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases.dom
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases.dom
  +  :/source/exim4/AutoTest/aux/aliases
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases.dom"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases.dom"
     type=lsearch key="z"
   file lookup required for z
  -  in /source/exim4/AutoTest/aliases.dom
  +  in /source/exim4/AutoTest/aux/aliases.dom
   lookup failed
   expanded: 
   file is not a filter file
  @@ -362,21 +362,21 @@
   --------> l3 router <--------
   local_part=z domain=test.ex
   calling l3 router
  -rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aliases.other}}
  -search_open: lsearch "/source/exim4/AutoTest/aliases.other"
  +rda_interpret (string): ${lookup{$local_part}lsearch{/source/exim4/AutoTest/aux/aliases.other}}
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases.other"
     cached closed
   Too many lookup files open
  -  closing :/source/exim4/AutoTest/aliases
  -search_find: file="/source/exim4/AutoTest/aliases.other"
  +  closing :/source/exim4/AutoTest/aux/aliases
  +search_find: file="/source/exim4/AutoTest/aux/aliases.other"
     key="z" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases.other
  -  :/source/exim4/AutoTest/aliases.dom
  +  :/source/exim4/AutoTest/aux/aliases.other
  +  :/source/exim4/AutoTest/aux/aliases.dom
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases.other"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases.other"
     type=lsearch key="z"
   file lookup required for z
  -  in /source/exim4/AutoTest/aliases.other
  +  in /source/exim4/AutoTest/aux/aliases.other
   lookup failed
   expanded: 
   file is not a filter file
  @@ -389,12 +389,12 @@
   search_open: cdb "/source/exim4/AutoTest/aux/117.cdb1"
     cached closed
   Too many lookup files open
  -  closing :/source/exim4/AutoTest/aliases.dom
  +  closing :/source/exim4/AutoTest/aux/aliases.dom
   search_find: file="/source/exim4/AutoTest/aux/117.cdb1"
     key="z" partial=-1 affix=NULL starflags=0
   LRU list:
     0/source/exim4/AutoTest/aux/117.cdb1
  -  :/source/exim4/AutoTest/aliases.other
  +  :/source/exim4/AutoTest/aux/aliases.other
     End
   internal_search_find: file="/source/exim4/AutoTest/aux/117.cdb1"
     type=cdb key="z"
  @@ -412,7 +412,7 @@
   search_open: cdb "/source/exim4/AutoTest/aux/117.cdb2"
     cached closed
   Too many lookup files open
  -  closing :/source/exim4/AutoTest/aliases.other
  +  closing :/source/exim4/AutoTest/aux/aliases.other
   search_find: file="/source/exim4/AutoTest/aux/117.cdb2"
     key="z" partial=-1 affix=NULL starflags=0
   LRU list:


  Index: 565
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stderr/565,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 565    8 Oct 2004 14:50:08 -0000    1.1
  +++ 565    14 Oct 2004 11:16:36 -0000    1.2
  @@ -9,70 +9,70 @@
   admin user
   originator: uid=1169 gid=1169 login=ph10 name=Philip Hazel
   sender address = ph10@???
  -search_open: lsearch "/source/exim4/AutoTest/aliases"
  -search_find: file="/source/exim4/AutoTest/aliases"
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases"
  +search_find: file="/source/exim4/AutoTest/aux/aliases"
     key="list" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases"
     type=lsearch key="list"
   file lookup required for list
  -  in /source/exim4/AutoTest/aliases
  +  in /source/exim4/AutoTest/aux/aliases
   lookup yielded: ph10, mug99
  -search_open: lsearch "/source/exim4/AutoTest/aliases"
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases"
     cached open
  -search_find: file="/source/exim4/AutoTest/aliases"
  +search_find: file="/source/exim4/AutoTest/aux/aliases"
     key="list" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases"
     type=lsearch key="list"
   cached data used for lookup of list
  -  in /source/exim4/AutoTest/aliases
  +  in /source/exim4/AutoTest/aux/aliases
   lookup yielded: ph10, mug99
  -search_open: lsearch "/source/exim4/AutoTest/aliases"
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases"
     cached open
  -search_find: file="/source/exim4/AutoTest/aliases"
  +search_find: file="/source/exim4/AutoTest/aux/aliases"
     key="root" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases"
     type=lsearch key="root"
   file lookup required for root
  -  in /source/exim4/AutoTest/aliases
  +  in /source/exim4/AutoTest/aux/aliases
   lookup yielded: ph10
  -search_open: lsearch "/source/exim4/AutoTest/aliases"
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases"
     cached open
  -search_find: file="/source/exim4/AutoTest/aliases"
  +search_find: file="/source/exim4/AutoTest/aux/aliases"
     key="root" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases"
     type=lsearch key="root"
   cached data used for lookup of root
  -  in /source/exim4/AutoTest/aliases
  +  in /source/exim4/AutoTest/aux/aliases
   lookup yielded: ph10
  -search_open: lsearch "/source/exim4/AutoTest/aliases"
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases"
     cached open
  -search_find: file="/source/exim4/AutoTest/aliases"
  +search_find: file="/source/exim4/AutoTest/aux/aliases"
     key="list" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases"
     type=lsearch key="list"
   cached data used for lookup of list
  -  in /source/exim4/AutoTest/aliases
  +  in /source/exim4/AutoTest/aux/aliases
   lookup yielded: ph10, mug99
   search_open: testdb "NULL"
   search_find: file="NULL"
     key="something" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
   internal_search_find: file="NULL"
     type=testdb key="something"
  @@ -83,7 +83,7 @@
   search_find: file="NULL"
     key="something" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
   internal_search_find: file="NULL"
     type=testdb key="something"
  @@ -94,7 +94,7 @@
   search_find: file="NULL"
     key="nocache" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
   internal_search_find: file="NULL"
     type=testdb key="nocache"
  @@ -106,35 +106,35 @@
   search_find: file="NULL"
     key="something" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
   internal_search_find: file="NULL"
     type=testdb key="something"
   database lookup required for something
   lookup yielded: something
  -search_open: lsearch "/source/exim4/AutoTest/aliases"
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases"
     cached open
  -search_find: file="/source/exim4/AutoTest/aliases"
  +search_find: file="/source/exim4/AutoTest/aux/aliases"
     key="list" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases"
     type=lsearch key="list"
   cached data used for lookup of list
  -  in /source/exim4/AutoTest/aliases
  +  in /source/exim4/AutoTest/aux/aliases
   lookup yielded: ph10, mug99
  -search_open: lsearch "/source/exim4/AutoTest/aliases"
  +search_open: lsearch "/source/exim4/AutoTest/aux/aliases"
     cached open
  -search_find: file="/source/exim4/AutoTest/aliases"
  +search_find: file="/source/exim4/AutoTest/aux/aliases"
     key="root" partial=-1 affix=NULL starflags=0
   LRU list:
  -  :/source/exim4/AutoTest/aliases
  +  :/source/exim4/AutoTest/aux/aliases
     End
  -internal_search_find: file="/source/exim4/AutoTest/aliases"
  +internal_search_find: file="/source/exim4/AutoTest/aux/aliases"
     type=lsearch key="root"
   cached data used for lookup of root
  -  in /source/exim4/AutoTest/aliases
  +  in /source/exim4/AutoTest/aux/aliases
   lookup yielded: ph10
   search_tidyup called
   >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>


  Index: 082
  ===================================================================
  RCS file: /home/cvs/exim/exim-test-orig/AutoTest/stdout/082,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- 082    8 Oct 2004 14:50:13 -0000    1.1
  +++ 082    14 Oct 2004 11:16:36 -0000    1.2
  @@ -121,7 +121,7 @@
   > stat:   mode=0644 smode=-rw-r--r-- inode=458087 device=775 links=1 uid=1169 gid=1169 size=0 atime=dddddddddd mtime=dddddddddd ctime=dddddddddd
   > Failed: stat(/a/non/existent/file) failed: No such file or directory
   > stat:   mode=4755 smode=-rwsr-xr-x inode=457943 device=775 links=1 uid=1169 gid=1169 size=0 atime=dddddddddd mtime=dddddddddd ctime=dddddddddd
  -> stat:   mode=40755 smode=drwxr-xr-x inode=457878 device=775 links=5 uid=1169 gid=1169 size=8192 atime=dddddddddd mtime=dddddddddd ctime=dddddddddd
  +> stat:   mode=40755 smode=drwxr-xr-x inode=457878 device=775 links=6 uid=1169 gid=1169 size=8192 atime=dddddddddd mtime=dddddddddd ctime=dddddddddd
   > time_interval: 0s
   > time_interval: 44s
   > time_interval: 1w4d13h46m39s