summaryrefslogtreecommitdiffstats
path: root/test/Java/RMIC.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2018-10-09 20:23:51 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2018-10-09 20:23:51 (GMT)
commitade84bc59db524fbccd670bfadefa786407c7c0b (patch)
treea3da7c7e0fa926ad41f01ae09ab709c660c67bd9 /test/Java/RMIC.py
parenta1c6873e2f84240feab9a923ccc1ebcda3160339 (diff)
parente342d031c2a80cc7eb27ca139b7adee2d37a8216 (diff)
downloadSCons-ade84bc59db524fbccd670bfadefa786407c7c0b.zip
SCons-ade84bc59db524fbccd670bfadefa786407c7c0b.tar.gz
SCons-ade84bc59db524fbccd670bfadefa786407c7c0b.tar.bz2
Merge remote-tracking branch 'upstream/master' into subst_rewrite
Diffstat (limited to 'test/Java/RMIC.py')
-rw-r--r--test/Java/RMIC.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/test/Java/RMIC.py b/test/Java/RMIC.py
index b29a466..19e799e 100644
--- a/test/Java/RMIC.py
+++ b/test/Java/RMIC.py
@@ -108,6 +108,10 @@ if java_version.count('.') == 1:
# If it's 1.8 or higher, we skip the further RMIC test
# because we'll get warnings about the deprecated API...
# it's just not state-of-the-art anymore.
+# Recent java versions (9 and greater) are back to being
+# marketed as a simple version, but java_where_javac() will
+# still return a dotted version, like 10.0. If this changes,
+# will need to rework this rule.
# Note, how we allow simple version strings like "5" and
# "6" to successfully pass this test.
if curver < (1, 8):