Make router_name and transport_name usable for the expansions

[users/jgh/exim.git] / test / patchexim

diff --git a/test/patchexim b/test/patchexim
index c8fbe466bf2fb889ff4b4bfb2c18a07bbadeeb14..3052b5dace1875914e63fd70700d5999f4b67774 100755 (executable)
--- a/test/patchexim
+++ b/test/patchexim
@@ -1,7 +1,5 @@
 #! /usr/bin/perl -w
 
 #! /usr/bin/perl -w
 

-# $Cambridge: exim/test/patchexim,v 1.1 2006/02/06 16:07:10 ph10 Exp $
-

 ###############################################################################
 # This is an auxiliary script that is part of the Exim test suite. It must be #
 # run as root, and is normally called from the main controlling script. Its   #
 ###############################################################################
 # This is an auxiliary script that is part of the Exim test suite. It must be #
 # run as root, and is normally called from the main controlling script. Its   #


@@ -18,7 +16,7 @@ open(OUT, ">eximdir/exim") || die "** Failed to open eximdir/exim: $!\n";
 while(<IN>)
   {
   s/>>>running<<</<<<testing>>>/;
 while(<IN>)
   {
   s/>>>running<<</<<<testing>>>/;

-  s/(\d+\.\d+(?:\.\d+)?(-RC\d+)?\0<<eximversion>>)/"x.yz\0" . ("*" x (length($1) - 5))/e;
+  s/(\d+\.\d+(?:[_.]\d+)?([_-]RC\d+|[_-]dev)?(?:[0-9a-fA-F-]*)(?:-XX)?\0<<eximversion>>)/"x.yz\0" . ("*" x (length($1) - 5))/e;

   print OUT;
   }
 
   print OUT;
   }