diff options
Diffstat (limited to 'make')
-rw-r--r-- | make/build-test.xml | 4 | ||||
-rwxr-xr-x | make/scripts/runtest.sh | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 9810f06..7f2c521 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -417,7 +417,7 @@ chmod 644 ${results}/* \${line.separator} <mkdir dir="${build}/test/results"/> </target> - <target name="junit.run.local.d32" if="isOSX"> + <target name="junit.run.local.osx.d32" if="isOSX"> <var name="jvmDataModel.arg" unset="true"/> <var name="jvmDataModel.arg" value="-d32"/> @@ -433,7 +433,7 @@ chmod 644 ${results}/* \${line.separator} <var name="jvmDataModel.arg" value="-d64"/> </target> - <target name="junit.run.tests" depends="junit.run.local.d32, junit.run.local, junit.run.remote.ssh, junit.run.remote.adb"/> + <target name="junit.run.tests" depends="junit.run.local.osx.d32, junit.run.local, junit.run.remote.ssh, junit.run.remote.adb"/> <target name="junit.run.if.enabled" unless="junit.is.disabled"> <antcall target="junit.run.tests" inheritRefs="true" inheritAll="true"/> diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index d01867f..13f4aa0 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -47,7 +47,7 @@ rm -f $LOG #D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil -Djava.io.tmpdir=/run/tmp" #D_ARGS="-Djogamp.debug.IOUtil -Djogamp.debug.JNILibLoader -Djogamp.debug.TempFileCache -Djogamp.debug.JarUtil -Djogamp.debug.TempJarCache" #D_ARGS="-Djogamp.debug.JNILibLoader -Djogamp.gluegen.UseTempJarCache=false" -#D_ARGS="-Djogamp.debug.JNILibLoader" +D_ARGS="-Djogamp.debug.JNILibLoader" #D_ARGS="-Djogamp.debug.Lock" #D_ARGS="-Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" #D_ARGS="-Djogamp.debug.Lock.TraceLock" @@ -60,6 +60,8 @@ function onetest() { #CLASSPATH=lib/junit.jar:$ANT_JARS:$builddir/../make/lib/TestJarsInJar.jar:$builddir/classes:$builddir/test/build/classes #libspath=$builddir/obj:$builddir/test/build/natives: LD_LIBRARY_PATH=$libspath:$LD_LIBRARY_PATH + DYLD_LIBRARY_PATH=$LD_LIBRARY_PATH + export LD_LIBRARY_PATH DYLD_LIBRARY_PATH echo LD_LIBRARY_PATH $LD_LIBRARY_PATH echo CLASSPATH $CLASSPATH echo java -cp $CLASSPATH $D_ARGS -Djava.library.path=$libspath $clazz @@ -67,7 +69,7 @@ function onetest() { echo } -onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG +#onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG @@ -87,7 +89,7 @@ onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG #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.gluegen.test.junit.generation.Test1p1JavaEmitter 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 |