diff options
| author | Russel Winder <russel@winder.org.uk> | 2016-01-19 17:30:41 (GMT) |
|---|---|---|
| committer | Russel Winder <russel@winder.org.uk> | 2016-01-19 17:30:41 (GMT) |
| commit | 358c0de48a7d9fecdb30e24505c066506dfcdeff (patch) | |
| tree | e3da370799409e61468868397770eeba5a5fe4bf /QMTest | |
| parent | 374acc32ce7ebecbc23dae5859315ddee17e523b (diff) | |
| parent | 6cc2ad09d86e6da5812485b0e50a820e2560b31b (diff) | |
| download | SCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.zip SCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.tar.gz SCons-358c0de48a7d9fecdb30e24505c066506dfcdeff.tar.bz2 | |
Merge in default.
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestSCons.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 3857da5..6820ae1 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -201,6 +201,7 @@ class TestSCons(TestCommon): """ scons_version = SConsVersion + javac_is_gcj = False def __init__(self, **kw): """Initialize an SCons testing object. @@ -768,8 +769,13 @@ class TestSCons(TestCommon): m = re.search(r'javac (\d\.\d)', self.stderr()) if m: version = m.group(1) + self.javac_is_gcj = False + elif self.stderr().find('gcj'): + version='1.2' + self.javac_is_gcj = True else: version = None + self.javac_is_gcj = False return where_javac, version def java_where_javah(self, version=None): @@ -792,6 +798,7 @@ class TestSCons(TestCommon): self.skip_test("Could not find Java rmic, skipping non-simulated test(s).\n") return where_rmic + def java_get_class_files(self, dir): result = [] for dirpath, dirnames, filenames in os.walk(dir): |