From: Heiko Schlittermann (HS12-RIPE) <hs@schlittermann.de>
Date: Wed, 15 Feb 2017 22:49:20 +0000 (+0100)
Subject: testsuite: make patchexim more relaxed for tag names
X-Git-Tag: exim-4_90_RC1~263
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=505162ede95fd7fcf4ce62692dee816ad8f8c84f;p=exim.git

testsuite: make patchexim more relaxed for tag names
---

diff --git a/test/patchexim b/test/patchexim
index 7bd84d49d..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;
   }