diff options
| author | William Blevins <wblevins@gmail.com> | 2015-03-24 02:48:48 (GMT) |
|---|---|---|
| committer | William Blevins <wblevins@gmail.com> | 2015-03-24 02:48:48 (GMT) |
| commit | 3b45927301d3dd1d5af54798c85b8f80c6571678 (patch) | |
| tree | 033ef7e45dfe205ccdfd308938c1d7802f03d0ef | |
| parent | b6c7bd73535753a45dec87e8bb3b8584443d40dd (diff) | |
| download | SCons-3b45927301d3dd1d5af54798c85b8f80c6571678.zip SCons-3b45927301d3dd1d5af54798c85b8f80c6571678.tar.gz SCons-3b45927301d3dd1d5af54798c85b8f80c6571678.tar.bz2 | |
Updated jni header directory expectations for tests.
My openjdk install link/dir also contained the architecture.
Example: RPM package java-1.7.0-openjdk-devel-1.7.0.75-2.5.4.0.el6_6.x86_64
created link /usr/lib/jvm/java-1.7.0-openjdk.x86_64
Affected tests:
test/Java/multi-step.py
test/Java/swig-dependencies.py
| -rw-r--r-- | QMTest/TestSCons.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index 8635f8e..923e319 100644 --- a/QMTest/TestSCons.py +++ b/QMTest/TestSCons.py @@ -693,7 +693,7 @@ class TestSCons(TestCommon): else: 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/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: |