diff options
| author | Phil Pennock <pdp@exim.org> | 2012-03-30 13:41:16 -0700 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2012-03-30 13:41:16 -0700 |
| commit | 026d45f59bc9c3f767217b75349c0479d237739f (patch) | |
| tree | 74f2083ac55c99095cf507c5fb9f5d213edc55ad /test | |
| parent | c45dd1801a10dc40580d422218ae8bfcd7128fc8 (diff) | |
handle more of the new format version numbers
Diffstat (limited to 'test')
| -rwxr-xr-x | test/patchexim | 2 | ||||
| -rwxr-xr-x | test/runtest | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/test/patchexim b/test/patchexim index d3f39bc73..3052b5dac 100755 --- a/test/patchexim +++ b/test/patchexim @@ -16,7 +16,7 @@ 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+(?:[_.]\d+)?([_-]RC\d+|[_-]dev)?(?:[0-9a-fA-F-]*)(?:-XX)?\0<<eximversion>>)/"x.yz\0" . ("*" x (length($1) - 5))/e; print OUT; } diff --git a/test/runtest b/test/runtest index 6a6aadd97..4be0f7918 100755 --- a/test/runtest +++ b/test/runtest @@ -312,7 +312,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) \d+\.\d+[\w_-]*/$1 x.yz/i; # Replace Exim message ids by a unique series s/((?:[^\W_]{6}-){2}[^\W_]{2}) |