Make smtp_receive_timeout main option expanded. Bug 564

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

diff --git a/test/patchexim b/test/patchexim
index 1143741fb0fd1e2673b5c16d45779264cfcfbd0f..3052b5dace1875914e63fd70700d5999f4b67774 100755 (executable)
--- a/test/patchexim
+++ b/test/patchexim
@@ -16,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+|-dev)?\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;
   }