diff options
| author | William Deegan <bill@baddogconsulting.com> | 2015-11-13 10:01:44 -0500 |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2015-11-13 10:01:44 -0500 |
| commit | 6fb578a109eac26882dc94a1d97e13e878b2b4b9 (patch) | |
| tree | 3d4643d1382f4fb3c0cf79b97a7caa10a6023711 /QMTest | |
| parent | 3ffd97a027482138b0b30e5c8e2785a2dd23c174 (diff) | |
| parent | b88c711085c0179fcc706d6813f49b3f82714dbd (diff) | |
| download | scons-6fb578a109eac26882dc94a1d97e13e878b2b4b9.tar.gz | |
Merged in williamblevins/scons_20150323 (pull request #244)
Diffstat (limited to 'QMTest')
| -rw-r--r-- | QMTest/TestSCons.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index a9b4e3eb..a9fd6a0f 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -34,7 +34,7 @@ from TestCmd import PIPE # here provides some independent verification that what we packaged # conforms to what we expect. -default_version = '2.3.6' +default_version = '2.4.2.alpha.yyyymmdd' python_version_unsupported = (2, 3, 0) python_version_deprecated = (2, 7, 0) @@ -714,6 +714,9 @@ class TestSCons(TestCommon): home = '/System/Library/Frameworks/JavaVM.framework/Home' else: home = '/System/Library/Frameworks/JavaVM.framework/Versions/%s/Home' % version + if not os.path.exists(home): + # This works on OSX 10.10 + home = '/System/Library/Frameworks/JavaVM.framework/Versions/Current/' else: jar = self.java_where_jar(version) home = os.path.normpath('%s/..'%jar) |