changeset 119:a278b31e6db2

8180946: Use Mercurial tags to identify GA builds Reviewed-by: ihse, mr Contributed-by: sean.coffey@oracle.com
author mr
date Tue, 04 Dec 2018 12:04:20 -0800
parents 480a8cdaefae
children 06edf044c2a8
files jcheck.py runtests.sh
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/jcheck.py	Fri Sep 21 09:14:50 2018 -0700
+++ b/jcheck.py	Tue Dec 04 12:04:20 2018 -0800
@@ -165,7 +165,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]+)$|jdk[4-9](u\d{1,3})?-b\d{2,3}$|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,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$")
 
 def badwhite_what(m):
     if m.group(1):
--- a/runtests.sh	Fri Sep 21 09:14:50 2018 -0700
+++ b/runtests.sh	Tue Dec 04 12:04:20 2018 -0800
@@ -126,6 +126,8 @@
 for t in foo tiptoe jdk7 jdk7-b1 "$whitespace_tag" \
          hs1-b02 hs11-b3 hs12-b004 hs13.001-b05 \
          jdk- jdk-9u1 jdk-9-1 jdk-9.01 \
+         jdk8u8-GA jdk-9+100-gav hs13.10-b12-g \
+         jdk8u8-b08-ga jdk-10.0.2+2-ga \
         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
@@ -141,6 +143,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 \
         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