Move QUICKACK disable as early as possible in server handling

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

diff --git a/test/patchexim b/test/patchexim
index 7bd84d49d2bf5c82a9aaed7b5aada4f40825c04e..2a40778205781b737a2c84d8d991e6a8b53e0b69 100755 (executable)
--- a/test/patchexim
+++ b/test/patchexim
@@ -19,7 +19,18 @@ 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-9a-fA-F-]*)(?:[-_]XX)?\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;
   }
 
   print OUT;
   }