[exim-cvs] Testsuite: handle RC tagging convention

Gitweb: https://git.exim.org/exim.git/commitdiff/e434e6743ac97c28b7d2b6d43f564eceb5450697

Commit:     e434e6743ac97c28b7d2b6d43f564eceb5450697
Parent:     37c0e209412be42f04a4599ecad6f901bff46f08
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Fri May 1 12:47:25 2020 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Fri May 1 12:47:25 2020 +0100

    Testsuite: handle RC tagging convention
---
 test/patchexim | 2 +-
 test/runtest   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/patchexim b/test/patchexim
index c2983e4..2a40778 100755
--- 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 c7ba26a..c73ad41 100755
--- 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})