summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-10-18 17:06:18 +0200
committerSven Gothel <[email protected]>2011-10-18 17:06:18 +0200
commitc25f90b0cd4f8cffa7b0765dff14461fda75286e (patch)
treeb00ee4c0aa8891dfac30b29a3efb00822aa4e3cf /make
parentc75e0f83412f789f9f9b4b40d4628200c9532d99 (diff)
use jvmDataModel.arg set by gluegen
Diffstat (limited to 'make')
-rw-r--r--make/build-test.xml4
1 files changed, 3 insertions, 1 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index db7da30..fe5c44f 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -44,7 +44,7 @@
<import file="${gluegen.root}/make/jogamp-env.xml" />
- <target name="declare.common" depends="jogamp.env.init">
+ <target name="declare.common" depends="jogamp.env.init, gluegen.cpptasks.detect.os">
<property name="rootrel.src.test" value="src/test" />
<property name="src.test" value="${project.root}/${rootrel.src.test}" />
@@ -99,6 +99,7 @@
<target name="junit.run" depends="test.compile">
<junit forkmode="once" showoutput="true" fork="true" includeAntRuntime="true">
<env key="${system.env.library.path}" path="${obj.all.paths}"/>
+ <jvmarg value="${jvmDataModel.arg}"/>
<jvmarg value="-Djava.library.path=${obj.all.paths}"/>
<!--
<jvmarg value="-Djogamp.debug.NativeLibrary=true"/>
@@ -148,6 +149,7 @@
output="${test.class.result.file}">
<env key="${system.env.library.path}" path="${obj.all.paths}"/>
<env key="CLASSPATH" value="${classpath.test}"/>
+ <arg line="${jvmDataModel.arg}"/>
<arg value="-Djava.library.path=${obj.all.paths}"/>
<!--
<arg line="-Djogamp.debug.NativeLibrary=true"/>