changeset 125:b8f3bac16fc8

Allow five-element version numbers in tags
author tbell
date Tue, 12 Mar 2019 09:27:17 -0700
parents 8dfb2d7295eb
children 4ac08a4210ec
files jcheck.py runtests.sh
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/jcheck.py	Fri Jun 29 13:30:40 2018 -0700
+++ b/jcheck.py	Tue Mar 12 09:27:17 2019 -0700
@@ -168,7 +168,7 @@
 normext_re = re.compile(".*\.(java|c|h|cpp|hpp)$")
 
 tag_desc_re = re.compile("Added tag [^ ]+ for changeset [0-9a-f]{12}")
-tag_re = re.compile("tip$|jdk-([1-9]([0-9]*)(\.(0|[1-9][0-9]*)){0,3})(\+(([0-9]+))|(-ga))$|jdk[4-9](u\d{1,3})?-((b\d{2,3})|(ga))$|hs\d\d(\.\d{1,2})?-b\d\d$")
+tag_re = re.compile("tip$|jdk-([1-9]([0-9]*)(\.(0|[1-9][0-9]*)){0,4})(\+(([0-9]+))|(-ga))$|jdk[4-9](u\d{1,3})?-((b\d{2,3})|(ga))$|hs\d\d(\.\d{1,2})?-b\d\d$")
 
 def badwhite_what(m):
     if m.group(1):
--- a/runtests.sh	Fri Jun 29 13:30:40 2018 -0700
+++ b/runtests.sh	Tue Mar 12 09:27:17 2019 -0700
@@ -144,7 +144,7 @@
         jdk4u4-b04 jdk5u5-b05 jdk6u6-b06 jdk7u7-b07 jdk8u8-b08 jdk9u9-b09 \
         jdk8u80-b08 jdk8u100-b100 \
         jdk-9+100 jdk-9.1.2.1+3 jdk-9.0.1+42 jdk-9.0.1.19+43 \
-        jdk-9-ga jdk-11.0.2-ga jdk8u192-ga \
+        jdk-9-ga jdk-11.0.2-ga jdk-11.0.2.0.1-ga jdk8u192-ga \
         hs11-b02 hs12.1-b11 hs13.10-b12 ; do
   echo "-- $r tag $t"
   if ! HGUSER=$setup_author $HG tag -r 1 "$t"; then fail $r; fi