diff options
| author | Sven Gothel <[email protected]> | 2013-02-28 21:55:02 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-02-28 21:55:02 +0100 |
| commit | 692ee1477a5422cb119070ecd87321833c302873 (patch) | |
| tree | f1d1883d099f2e9ed8719f3fab2eb257dc602c08 /make | |
| parent | 99a50b38f5650fedca0f207e03706ffa9492e50c (diff) | |
Unit Tests: OSX/Java7 w/o 32bit tests ; Reliable Test1p*JavaEmitter JNI binding initialization
- OSX/Java7 w/o 32bit tests
OSX/Java7 has no 32bit JVM, disable d32 tests for such, using property 'use.macosx32'
- Reliable Test1p*JavaEmitter JNI binding initialization
Load libs and init JNI binding statically w/ @BeforeClass,
since OSX/Java7 for some reason gets confused (?) w/ init sequence.
This is no issue for JOGL etc .. as far we have observed.
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 7 | ||||
| -rwxr-xr-x | make/scripts/runtest.sh | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 7f2c521..8a11a17 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -384,8 +384,9 @@ chmod 644 ${results}/* \${line.separator} <jvmarg value="-Dgluegen.root=${gluegen.root}"/> <jvmarg value="-Drootrel.build=${rootrel.build}"/> <!-- - <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/> - <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/> + <jvmarg value="-Djogamp.debug.NativeLibrary=true"/> + <jvmarg value="-Djogamp.debug.ProcAddressHelper=true"/> + <jvmarg value="-Djogamp.debug.JNILibLoader=true"/> <jvmarg value="-verbose:jni"/> <jvmarg value="-client"/> --> @@ -417,7 +418,7 @@ chmod 644 ${results}/* \${line.separator} <mkdir dir="${build}/test/results"/> </target> - <target name="junit.run.local.osx.d32" if="isOSX"> + <target name="junit.run.local.osx.d32" if="use.macosx32"> <var name="jvmDataModel.arg" unset="true"/> <var name="jvmDataModel.arg" value="-d32"/> diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index 3eaec4b..f8615a5 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -93,8 +93,8 @@ function onetest() { #onetest com.jogamp.gluegen.PCPPTest 2>&1 | tee -a $LOG #onetest com.jogamp.common.nio.TestPointerBufferEndian 2>&1 | tee -a $LOG #onetest com.jogamp.common.nio.TestStructAccessorEndian 2>&1 | tee -a $LOG -onetest com.jogamp.common.os.TestElfReader01 2>&1 | tee -a $LOG -#onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG +#onetest com.jogamp.common.os.TestElfReader01 2>&1 | tee -a $LOG +onetest com.jogamp.gluegen.test.junit.generation.Test1p1JavaEmitter 2>&1 | tee -a $LOG #onetest com.jogamp.gluegen.test.junit.generation.Test1p2ProcAddressEmitter 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestPlatform01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestRunnableTask01 2>&1 | tee -a $LOG |