diff options
| author | dirkbaechle <devnull@localhost> | 2012-09-04 23:23:13 (GMT) |
|---|---|---|
| committer | dirkbaechle <devnull@localhost> | 2012-09-04 23:23:13 (GMT) |
| commit | 1c8744b6d4ec8812746415d1aae4f13e634809ca (patch) | |
| tree | 5d422a83251e4afe9a3941b3bb97a79fdb38765f /QMTest/TestSCons.py | |
| parent | a54670d821ac18abc3880ef9ca03c2f84edd5ae6 (diff) | |
| download | SCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.zip SCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.tar.gz SCons-1c8744b6d4ec8812746415d1aae4f13e634809ca.tar.bz2 | |
- first swoop of changes for getting all Buildbot slaves to run successfully again
Diffstat (limited to 'QMTest/TestSCons.py')
| -rw-r--r-- | QMTest/TestSCons.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 360a799..de4a39b 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -698,13 +698,13 @@ class TestSCons(TestCommon): import sys if not version: version='' - frame = '/System/Library/Frameworks/JavaVM.framework/Headers/jni.h' + jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Headers/jni.h', + '/usr/lib/jvm/default-java/include/jni.h'] else: - frame = '/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/jni.h'%version - jni_dirs = ['/usr/lib/jvm/java-*-sun-%s*/include/jni.h'%version, - '/usr/java/jdk%s*/include/jni.h'%version, - frame, - ] + jni_dirs = ['/System/Library/Frameworks/JavaVM.framework/Versions/%s*/Headers/jni.h'%version] + jni_dirs.extend(['/usr/lib/jvm/java-*-sun-%s*/include/jni.h'%version, + '/usr/lib/jvm/java-%s*-openjdk/include/jni.h'%version, + '/usr/java/jdk%s*/include/jni.h'%version]) dirs = self.paths(jni_dirs) if not dirs: return None |