MySQL, pgsql: per-query server options outside the lookup string. Bug 2546

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

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

 
 

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

 
 ###############################################################################
 # This is an auxiliary script that is part of the Exim test suite. It must be #
 
 ###############################################################################
 # This is an auxiliary script that is part of the Exim test suite. It must be #


@@ -12,19 +13,30 @@
 # be copied. The script must be run in the correct current directory.         #
 ###############################################################################
 
 # be copied. The script must be run in the correct current directory.         #
 ###############################################################################
 

-open(IN, "$ARGV[0]") || die "** Failed to open $ARGV[0]: $!\n";
-open(OUT, ">eximdir/exim") || die "** Failed to open eximdir/exim: $!\n";
+open(IN, $ARGV[0]) || die "** Failed to open $ARGV[0]: $!\n";
+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+                         # major.minor
+    (?:[_.]\d+)?                      # optional security-patchlevel
+    (?:[_.]\d+)?                      # optional patchlevel
+    (?:[_-]RC\d+|[_-]?dev(?:start)?)? # optional RC or dev(start)
+    (?:(?:[_-]\d+)?                   # git tag distance
+       [-_][[:xdigit:]]+)?            # git id
+    (?:[-_]XX)?\0                     # git dirty bit
+    <<eximversion>>                   # marker
+    )
+   }
+   {"x.yz\0" . ("*" x (length($1) - 5))}xe;

   print OUT;
   }
 
 close(IN);
 close(OUT);
 
   print OUT;
   }
 
 close(IN);
 close(OUT);
 

-chmod 04755, "eximdir/exim";
+chmod 04755, 'eximdir/exim';

 
 # End of patchexim script
 
 # End of patchexim script