Testsuite: handle RC tagging convention

diff --git a/test/patchexim b/test/patchexim
index c2983e4d0b742cb449fbe0fe5cf53fe24196690f..2a40778205781b737a2c84d8d991e6a8b53e0b69 100755 (executable)
--- a/test/patchexim
+++ b/test/patchexim
@@ -20,7 +20,7 @@ while(<IN>)
   {
   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)

diff --git a/test/runtest b/test/runtest
index c7ba26ac97911b7bce68b2dc0b7c18367eebca67..c73ad41017b6b97e1178e56faaf25a5560c419bf 100755 (executable)
--- a/test/runtest
+++ b/test/runtest
@@ -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
-  #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})