# HG changeset patch
# User kcr
# Date 1505413452 25200
# Node ID 4c1a50d8ca7c945f013b509ad494303a165b1e36
# Parent  8ea43e4f0ebabffec2e047776606061aaa998aed
JavaFX tag format: $VER\-b$BUILD

diff --git a/jcheck.py b/jcheck.py
--- a/jcheck.py
+++ b/jcheck.py
@@ -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-([1-9]([0-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-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$|[1-9]((\.\d{1,3}){0,2})-b\d{2,3}$|[1-9]u(\d{1,3})-b\d{2,3}$")
 
 def badwhite_what(m):
     if m.group(1):
diff --git a/runtests.sh b/runtests.sh
--- a/runtests.sh
+++ b/runtests.sh
@@ -125,6 +125,7 @@
 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 \
+         2.2 2.2.2.2-b01 2.1.-b02 8u-b01 9-b1 \
         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
@@ -139,6 +140,8 @@
         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 \
+        2.0-b01 2.0.1-b02 2.3.45-b99 2.2.123-b100 \
+        8.0-b132 8u5-b00 8u100-b100 9-b47 \
         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