git://git.exim.org
/
users
/
heiko
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
c45dd18
)
handle more of the new format version numbers
author
Phil Pennock
<pdp@exim.org>
Fri, 30 Mar 2012 20:41:16 +0000
(13:41 -0700)
committer
Phil Pennock
<pdp@exim.org>
Fri, 30 Mar 2012 20:41:16 +0000
(13:41 -0700)
test/patchexim
patch
|
blob
|
history
test/runtest
patch
|
blob
|
history
diff --git
a/test/patchexim
b/test/patchexim
index d3f39bc73f13e2248c20b356775eed29f8c5d098..3052b5dace1875914e63fd70700d5999f4b67774 100755
(executable)
--- 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>>>/;
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;
}
print OUT;
}
diff --git
a/test/runtest
b/test/runtest
index 6a6aadd975d49644457ba909477811e4ba386d61..4be0f79181c99aecfff8467de7c11a77a673eb33 100755
(executable)
--- 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
# 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})
# Replace Exim message ids by a unique series
s/((?:[^\W_]{6}-){2}[^\W_]{2})