summaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-test.xml18
-rw-r--r--make/scripts/tests.sh34
2 files changed, 11 insertions, 41 deletions
diff --git a/make/build-test.xml b/make/build-test.xml
index 52f8362fe..f1fe937e3 100644
--- a/make/build-test.xml
+++ b/make/build-test.xml
@@ -37,10 +37,7 @@
<property name="java.dir.bugs" value="${java.dir.test}/bugs"/>
<property name="test.archive.name" value="${archive.name}-test-results-${build.node.name}"/>
- <condition property="jvmarg.mainthrd" value="-XstartOnFirstThread"><isset property="isOSX"/></condition>
- <condition property="jvmarg.mainthrd" value="-Ddummy"><not><isset property="isOSX"/></not></condition>
- <condition property="jvmarg.headless" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition>
- <condition property="jvmarg.headless" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition>
+ <property name="jvmarg.headless" value="-Djava.awt.headless=true"/>
<property name="batchtest.timeout" value="1800000"/> <!-- 30 min -->
</target>
@@ -353,8 +350,7 @@
<!-- Test*NEWT*
- Emulation of junit task,
- due to the fact that we have to place invoke our MainThread class first (-> MacOSX).
+ Emulation of junit task.
Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties).
-->
@@ -397,11 +393,9 @@
<arg line="${jvmDataModel.arg}"/>
<arg value="-Djava.library.path=${obj.all.paths}"/>
<arg line="${jvmarg.headless}"/>
- <arg line="${jvmarg.mainthrd}"/>
<!--
<arg line="-Dnewt.debug.EDT"/>
-->
- <arg line="com.jogamp.newt.util.MainThread"/>
<arg line="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner"/>
<srcfile/>
<arg line="filtertrace=true"/>
@@ -655,8 +649,7 @@
<target name="junit.run.newt.headless.singletest" depends="test.compile, junit.run.settings">
<!-- Test*NEWT*
- Emulation of junit task,
- due to the fact that we have to place invoke our MainThread class first (-> MacOSX).
+ Emulation of junit task.
Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties).
-->
@@ -676,11 +669,9 @@
<arg line="${jvmDataModel.arg}"/>
<arg value="-Djava.library.path=${obj.all.paths}"/>
<arg line="${jvmarg.headless}"/>
- <arg line="${jvmarg.mainthrd}"/>
<!--
<arg line="-Dnewt.debug.EDT"/>
-->
- <arg line="com.jogamp.newt.util.MainThread"/>
<arg line="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner"/>
<!-- srcfile/ -->
<arg line="${testclass}"/>
@@ -745,7 +736,6 @@
<arg line="${jvmDataModel.arg}"/>
<arg value="-Djava.library.path=${obj.all.paths}"/>
<arg line="${jvmarg.headless}"/>
- <arg line="${jvmarg.mainthrd}"/>
<!--
<arg line="-Dnewt.debug.EDT"/>
-->
@@ -950,7 +940,6 @@ ${junit.run.arg1}\${line.separator}
${jvmDataModel.arg}\${line.separator}
-cp ${junit_jogl_noawt.run.remote.jars}\${line.separator}
${jvmarg.headless}\${line.separator}
-com.jogamp.newt.util.MainThread\${line.separator}
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner \${line.separator}
${test.class.fqn} \${line.separator}
filtertrace=true \${line.separator}
@@ -1061,7 +1050,6 @@ ${junit.run.arg1}\${line.separator}
${jvmDataModel.arg}\${line.separator}
-cp ${junit_jogl_noawt.run.remote.jars}\${line.separator}
${jvmarg.headless}\${line.separator}
-com.jogamp.newt.util.MainThread\${line.separator}
org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner \${line.separator}
${test.class.fqn} \${line.separator}
filtertrace=true \${line.separator}
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 83553b564..aa9b9a3f9 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -31,7 +31,6 @@ spath=`dirname $0`
unset CLASSPATH
MOSX=0
-MOSX_MT=0
uname -a | grep -i Darwin && MOSX=1
if [ $MOSX -eq 1 ] ; then
echo setup OSX environment vars
@@ -41,7 +40,6 @@ if [ $MOSX -eq 1 ] ; then
echo NSZombieEnabled $NSZombieEnabled 2>&1 | tee -a java-run.log
echo NSTraceEvents $NSTraceEvents 2>&1 | tee -a java-run.log
echo OBJC_PRINT_EXCEPTIONS $OBJC_PRINT_EXCEPTIONS 2>&1 | tee -a java-run.log
- MOSX_MT=1
fi
# We use TempJarCache and JAR files per default now!
@@ -111,7 +109,7 @@ function jrun() {
#X_ARGS="--illegal-access=warn"
#D_ARGS="-Djogl.debug.GLProfile -Djogl.debug.GLContext"
- D_ARGS="-Djogl.debug.GLContext -Dnativewindow.debug.OSXUtil.MainThreadChecker"
+ D_ARGS="-Dnativewindow.debug.OSXUtil.MainThreadChecker -Djogamp.common.utils.locks.Lock.timeout=600000"
#D_ARGS="-Djogl.debug.GLProfile"
#D_ARGS="-Djogl.debug.DebugGL"
#D_ARGS="-Djogl.debug.TraceGL"
@@ -401,18 +399,6 @@ function jrun() {
#X_ARGS="-Dnativewindow.ws.name=jogamp.newt.driver.broadcom.egl $X_ARGS"
echo USE_BUILDDIR $USE_BUILDDIR
echo USE_CLASSPATH $USE_CLASSPATH
- if [ $MOSX_MT -eq 1 ] ; then
- if [ $awton -eq 0 -a $swton -eq 0 ] ; then
- # No AWT, No SWT -> Preserve Main-Thread
- X_ARGS="-XstartOnFirstThread $X_ARGS"
- C_ARG="com.jogamp.newt.util.MainThread"
- elif [ $awton -eq 0 -a $swton -eq 1 ] ; then
- # SWT Only: Launch on Main-Thread
- X_ARGS="-XstartOnFirstThread $X_ARGS"
- # elif [ $awton -eq 1 -a $swton -eq 1 ] ; then
- # AWT and SWT -> Use AWT Main-Thread
- fi
- fi
echo
echo "Test Start: $*"
echo
@@ -437,12 +423,10 @@ function testnoawt() {
}
function testjfx() {
- MOSX_MT=0
jrun 1 0 $* 2>&1 | tee -a java-run.log
}
function testawt() {
- MOSX_MT=0
jrun 1 0 $* 2>&1 | tee -a java-run.log
}
@@ -485,7 +469,7 @@ function testawtswt() {
#
# HiDPI
#
-#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2SimpleNEWT $*
#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $*
#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $*
@@ -793,7 +777,7 @@ function testawtswt() {
#
#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor01 $*
#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor02NewtGLWindow $*
-# testswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn $*
+#testswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn $*
#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn $*
#testswt com.jogamp.opengl.test.junit.jogl.demos.es2.swt.TestGearsES2SWT $*
#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTEclipseGLCanvas01GLn $*
@@ -803,8 +787,6 @@ function testawtswt() {
#
# awtswt (testawtswt)
-# Per default (unit tests) all test are performed this way
-# with OSX: -XstartOnFirstThread
#
#testawtswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTEclipseGLCanvas01GLn $*
#testawtswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor03AWTGLn $*
@@ -961,15 +943,15 @@ function testawtswt() {
# Always
#testawt com.jogamp.opengl.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 $*
#testawt com.jogamp.opengl.test.junit.newt.event.TestParentingFocus02SwingAWTRobot $*
-# Sometimes, might be removed
-#testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug572AWT $*
-#testawt com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLJPanelInit02AWT $*
-#testawt com.jogamp.opengl.test.junit.newt.event.TestNewtEventModifiersAWTCanvas $*
#
# OSX Bug 1398
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2NEWT1 $*
#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT10 $*
-testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $*
+#
+#testawt com.jogamp.opengl.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 $*
+#testawt com.jogamp.opengl.test.junit.newt.event.TestParentingFocus02SwingAWTRobot $*
+#
# Linux DRM/GBM
#
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-25 01:51:07 +0000