changeset 104:196ab0ad64ad

Allow tags for update releases w/3 digits
author jcoomes
date Thu, 08 Jan 2015 16:06:33 -0800
parents 347e9c5e73b0
children d46eaf84b346
files jcheck.py runtests.sh
diffstat 2 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/jcheck.py	Thu Jun 05 19:42:31 2014 -0700
+++ b/jcheck.py	Thu Jan 08 16:06:33 2015 -0800
@@ -144,7 +144,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[4-9](u\d{1,2})?-b\d{2,3}$|hs\d\d(\.\d{1,2})?-b\d\d$")
+tag_re = re.compile("tip$|jdk[4-9](u\d{1,3})?-b\d{2,3}$|hs\d\d(\.\d{1,2})?-b\d\d$")
 
 def badwhite_what(m):
     if m.group(1):
--- a/runtests.sh	Thu Jun 05 19:42:31 2014 -0700
+++ b/runtests.sh	Thu Jan 08 16:06:33 2015 -0800
@@ -124,7 +124,7 @@
 HG='hg --config hooks.pretxncommit.jcheck=python:jcheck.hook'
 for t in foo tiptoe jdk7 jdk7-b1 "$whitespace_tag" \
          hs1-b02 hs11-b3 hs12-b004 hs13.001-b05 \
-        jdk6u22 jdk6u222-b01 jdk6u-b01 jdk6u11-b1 ; do
+        jdk6u22 jdk6u-b01 jdk6u11-b1 jdk6u1000-b01 ; do
   echo "-- $r tag $t"
   if HGUSER=$setup_author $HG tag -r 1 "$t"; then hg rollback; fail $r; fi
   hg revert -a; rm .hgtags
@@ -134,7 +134,8 @@
 HG='hg --config hooks.pretxncommit.jcheck=python:jcheck.hook'
 for t in jdk4-b01 jdk5-b01 jdk6-b01 jdk7-b01 jdk8-b01 jdk9-b01 \
         jdk4-b100 jdk8-b800 \
-        jdk4u4-b04 jdk5u5-b05 jdk6u6-b06 jdk7u7-b07 jdk8u8-b08 jdk8u80-b08 \
+        jdk4u4-b04 jdk5u5-b05 jdk6u6-b06 jdk7u7-b07 jdk8u8-b08 jdk9u9-b09 \
+        jdk8u80-b08 jdk8u100-b100 \
         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