From 692ee1477a5422cb119070ecd87321833c302873 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Thu, 28 Feb 2013 21:55:02 +0100
Subject: 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.
---
 make/build-test.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'make/build-test.xml')

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"/>
 
-- 
cgit v1.2.3