diff options
| author | William Deegan <bill@baddogconsulting.com> | 2016-01-17 14:02:32 -0800 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2016-01-17 14:02:32 -0800 |
| commit | 85f0d35fa2bccdf2a9b301c4e944f862ad934a36 (patch) | |
| tree | bfc61a737c90e8aad39f42348b9c8bb3ef227138 /QMTest | |
| parent | 32aaeefb59c6157b1bba999bb0dd821cc09e170b (diff) | |
| download | scons-85f0d35fa2bccdf2a9b301c4e944f862ad934a36.tar.gz | |
changes to skip tests on ubuntu-next when gcj and not real java, and also when no latex is available
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 a9fd6a0f..43832e89 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): |