X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=blobdiff_plain;f=test%2Fpatchexim;h=cb9f98825102d06cee8eba8b69e886bc1ed2af78;hp=9659ba133cecd443e3ef5ac101d7dc544c3f5979;hb=22c3450e246798a06554257dc227eaf7f9b48741;hpb=e3ad39bd4156cc80ae3b20b8839cb9c0b238b31b

diff --git a/test/patchexim b/test/patchexim
index 9659ba133..cb9f98825 100755
--- a/test/patchexim
+++ b/test/patchexim
@@ -19,7 +19,17 @@ open(OUT, '>eximdir/exim') || die "** Failed to open eximdir/exim: $!\n";
 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 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;
   }