Testsuite: handle RC tagging convention
authorJeremy Harris <jgh146exb@wizmail.org>
Fri, 1 May 2020 11:47:25 +0000 (12:47 +0100)
committerJeremy Harris <jgh146exb@wizmail.org>
Fri, 1 May 2020 11:47:25 +0000 (12:47 +0100)
test/patchexim
test/runtest

index c2983e4..2a40778 100755 (executable)
@@ -20,7 +20,7 @@ while(<IN>)
   {
   s/>>>running<<</<<<testing>>>/;
   s{
   {
   s/>>>running<<</<<<testing>>>/;
   s{
-    (\d+\.\d+                         # major.minor
+    (\d+[_.]\d+                       # major.minor
     (?:[_.]\d+)?                      # optional security-patchlevel
     (?:[_.]\d+)?                      # optional patchlevel
     (?:[_-]RC\d+|[_-]?dev(?:start)?)? # optional RC or dev(start)
     (?:[_.]\d+)?                      # optional security-patchlevel
     (?:[_.]\d+)?                      # optional patchlevel
     (?:[_-]RC\d+|[_-]?dev(?:start)?)? # optional RC or dev(start)
index c7ba26a..c73ad41 100755 (executable)
@@ -404,7 +404,7 @@ RESET_AFTER_EXTRA_LINE_READ:
 
   # Replace the Exim version number (may appear in various places)
   # patchexim should have fixed this for us
 
   # Replace the Exim version number (may appear in various places)
   # patchexim should have fixed this for us
-  #s/(Exim) \d+\.\d+[\w_-]*/$1 x.yz/i;
+  #s/Exim \K\d+[._]\d+[\w_-]*/x.yz/i;
 
   # Replace Exim message ids by a unique series
   s/((?:[^\W_]{6}-){2}[^\W_]{2})
 
   # Replace Exim message ids by a unique series
   s/((?:[^\W_]{6}-){2}[^\W_]{2})