From 4178bd7ace4291eaffc3aad45e5503a7645e05d3 Mon Sep 17 00:00:00 2001 From: Dirk Baechle Date: Fri, 8 Aug 2014 19:32:48 +0200 Subject: - added javac version sentinel to another test that would fail with v1.8 and higher --- test/Repository/RMIC.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/test/Repository/RMIC.py b/test/Repository/RMIC.py index b214b4b..886ccdb 100644 --- a/test/Repository/RMIC.py +++ b/test/Repository/RMIC.py @@ -35,6 +35,27 @@ python = TestSCons.python test = TestSCons.TestSCons() where_javac, java_version = test.java_where_javac() + +# Try to get the major/minor Java version +curver = (1, 0) +if java_version.count('.') == 1: + # Check Java version + major, minor = java_version.split('.') + try: + curver = (int(major), int(minor)) + except: + pass + +# Check the version of the found Java compiler. +# 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. +# Note, how we allow simple version strings like "5" and +# "6" to successfully pass this test. +if curver >= (1, 8): + test.skip_test('The found version of javac is higher than 1.7, skipping test.\n') + + where_java = test.java_where_java() where_rmic = test.java_where_rmic() -- cgit v0.12