From f067b35d278ddafcc4e48668f0eade10c71a69c0 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Tue, 29 Sep 2015 13:18:21 -0700 Subject: add another possible path for JAVA_HOME on OSX --- QMTest/TestSCons.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 06fa575..75bf395 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -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) -- cgit v0.12