diff options
Diffstat (limited to 'make')
-rw-r--r-- | make/build-test.xml | 25 | ||||
-rw-r--r-- | make/build.xml | 2 | ||||
-rw-r--r-- | make/scripts/junit-singletest-x64.bat | 1 | ||||
-rw-r--r-- | make/scripts/junit-singletest-x64.sh | 1 | ||||
-rwxr-xr-x | make/scripts/tests-osx.sh | 2 | ||||
-rwxr-xr-x | make/scripts/tests-x32.bat | 3 | ||||
-rwxr-xr-x | make/scripts/tests-x32.sh | 2 | ||||
-rwxr-xr-x | make/scripts/tests-x64.bat | 3 | ||||
-rwxr-xr-x | make/scripts/tests-x64.sh | 2 | ||||
-rwxr-xr-x | make/scripts/tests.sh | 15 |
10 files changed, 47 insertions, 9 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 7c80b5f53..f996ba2c1 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -309,6 +309,31 @@ </junit> </target> + <target name="junit.run.awt.singletest" depends="test.compile"> + <!-- Test*AWT* --> + <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> + <env key="${system.env.library.path}" path="${obj.all.paths}"/> + <jvmarg value="-Djava.library.path=${obj.all.paths}"/> + + <!-- + <jvmarg value="-Djogl.debug=all"/> + <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/> + <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/> + <jvmarg value="-Djogl.debug.GLSLState"/> + <jvmarg value="-Dnativewindow.debug=all"/> + <jvmarg value="-verbose:jni"/> + <jvmarg value="-client"/> + <jvmarg value="-d32"/> + --> + + <formatter usefile="false" type="plain"/> + <formatter usefile="true" type="xml"/> + <classpath refid="junit_jogl_newt_awt.run.classpath"/> + + <test name="${testclass}"/> + </junit> + </target> + <target name="junit.run.swt.headless" depends="test.compile" description="Runs all pure SWT tests."> <!-- Test*SWT* diff --git a/make/build.xml b/make/build.xml index c9dfca0b4..d9fdf1e5b 100644 --- a/make/build.xml +++ b/make/build.xml @@ -233,7 +233,7 @@ <property name="javadoc.spec.packagenames" value="javax.media.opengl.*" /> <property name="javadoc.windowtitle" value="JOGL, NativeWindow and NEWT APIs" /> - <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames}, ${javadoc.spec.packagenames}, com.jogamp.opengl, com.jogamp.opengl.util.*, com.jogamp.nativewindow, com.jogamp.newt, com.jogamp.newt.util.*, com.jogamp.newt.event.*, com.jogamp.newt.opengl" /> + <property name="javadoc.packagenames" value="${javadoc.nw.spec.packagenames}, ${javadoc.spec.packagenames}, com.jogamp.opengl.*, com.jogamp.nativewindow.*, com.jogamp.newt.*" /> <property name="javadoc.dev.packagenames" value="${javadoc.packagenames}, com.jogamp.opengl.*, com.jogamp.nativewindow.*, com.jogamp.newt.*, com.jogamp.gluegen.opengl.*, com.jogamp.gluegen.runtime.opengl.*, jogamp.nativewindow.*, jogamp.opengl.*, jogamp.newt.*" /> diff --git a/make/scripts/junit-singletest-x64.bat b/make/scripts/junit-singletest-x64.bat new file mode 100644 index 000000000..78aff8be3 --- /dev/null +++ b/make/scripts/junit-singletest-x64.bat @@ -0,0 +1 @@ +scripts\make.jogl.all.win64.bat -Dtestclass=com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListAWT -f build-test.xml junit.run.awt.singletest
diff --git a/make/scripts/junit-singletest-x64.sh b/make/scripts/junit-singletest-x64.sh new file mode 100644 index 000000000..4cc51be00 --- /dev/null +++ b/make/scripts/junit-singletest-x64.sh @@ -0,0 +1 @@ +scripts/make.jogl.all.linux-x86_64.sh -Dtestclass=com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListAWT -f build-test.xml junit.run.awt.singletest diff --git a/make/scripts/tests-osx.sh b/make/scripts/tests-osx.sh index 79c4e6742..c6e83367f 100755 --- a/make/scripts/tests-osx.sh +++ b/make/scripts/tests-osx.sh @@ -2,6 +2,6 @@ spath=`dirname $0` -. $spath/tests.sh /usr/bin/java ../build-macosx +. $spath/tests.sh /usr/bin/java ../build-macosx $* diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat index 84d7f2d9b..07a60d995 100755 --- a/make/scripts/tests-x32.bat +++ b/make/scripts/tests-x32.bat @@ -33,5 +33,6 @@ REM scripts\java-win32.bat com.jogamp.opengl.test.junit.newt.TestCloseNewtAWT REM scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT -time 10000 REM scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleNEWT -time 10000 -scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn %1 %2 %3 %4 +REM scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn %1 %2 %3 %4 +scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT02GLn %1 %2 %3 %4 REM scripts\java-win32-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $* diff --git a/make/scripts/tests-x32.sh b/make/scripts/tests-x32.sh index 553392f89..edbab5ac6 100755 --- a/make/scripts/tests-x32.sh +++ b/make/scripts/tests-x32.sh @@ -2,6 +2,6 @@ spath=`dirname $0` -. $spath/tests.sh /opt-linux-x86/j2se6/bin/java ../build-x86 +. $spath/tests.sh /opt-linux-x86/j2se6/bin/java ../build-x86 $* diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat index 43cc8ccbb..3318b2072 100755 --- a/make/scripts/tests-x64.bat +++ b/make/scripts/tests-x64.bat @@ -47,7 +47,8 @@ REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingPr REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $* REM scripts\java-win64.bat com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol03NewtAWT $* -scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn %1 %2 %3 %4 +REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn %1 %2 %3 %4 +scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWT02GLn %1 %2 %3 %4 REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $* REM scripts\java-win64-dbg.bat com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT -time 5000 diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index 202280cc1..48c71c5d1 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -2,6 +2,6 @@ spath=`dirname $0` -. $spath/tests.sh /opt-linux-x86_64/j2se6/bin/java ../build-x86_64 +. $spath/tests.sh /opt-linux-x86_64/j2se6/bin/java ../build-x86_64 $* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index cedb51d9c..52dd65ac6 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -26,6 +26,7 @@ spath=`dirname $0` . $spath/setenv-jogl.sh $bdir JOGL_ALL MOSX=0 +MOSX_MT=0 uname -a | grep -i Darwin && MOSX=1 if [ $MOSX -eq 1 ] ; then MOSX_MT=1 @@ -50,18 +51,20 @@ function jrun() { #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.ExtensionAvailabilityCache" #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.GLProfile -Djogl.debug.GLDrawable" #D_ARGS="-Djogl.debug.GLProfile" - #D_ARGS="-Dnewt.debug.Window -Djogamp.common.utils.locks.Lock.timeout=600000 -Djogl.debug.Animator" # D_ARGS="-Dnewt.debug.EDT -Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.NativeWindow" #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT" # D_ARGS="-Dnewt.debug.EDT -Dnativewindow.debug.ToolkitLock.TraceLock -Dnativewindow.debug.X11Util.TraceDisplayLifecycle=true" #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=600000 -Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" + #D_ARGS="-Djogamp.common.utils.locks.Lock.timeout=1000 -Djogamp.debug.Lock -Djogamp.debug.Lock.TraceLock" # D_ARGS="-Dnewt.debug.Window -Dnewt.debug.EDT -Dnewt.debug.Display " #D_ARGS="-Dnewt.debug.EDT -Djogamp.common.utils.locks.Lock.timeout=600000 -Djogl.debug.Animator -Dnewt.debug.Display -Dnewt.debug.Screen" + #D_ARGS="-Dnewt.debug.Window -Djogamp.common.utils.locks.Lock.timeout=600000 -Djogl.debug.Animator" + #D_ARGS="-Djogl.debug.Animator -Dnewt.debug=all" #D_ARGS="-Dnewt.debug.EDT -Dnewt.debug.Display -Dnativewindow.debug.X11Util -Djogl.debug.GLDrawable -Djogl.debug.GLCanvas" #D_ARGS="-Djogl.debug.GLContext -Dnewt.debug=all" #D_ARGS="-Dnewt.debug.Screen -Dnewt.debug.EDT -Djogamp.debug.Lock" #D_ARGS="-Dnewt.debug.EDT" - D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all" + #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all" #D_ARGS="-Djogl.debug=all -Dnewt.debug=all" #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT -Djogl.debug.GLContext" #D_ARGS="-Dnewt.debug=all" @@ -132,6 +135,7 @@ function testawtmt() { #testawt -Djava.awt.headless=true com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT #testawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated #testnoawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $* +testnoawt com.jogamp.opengl.test.junit.jogl.swt.TestSWT02GLn $* # @@ -151,7 +155,7 @@ function testawtmt() { #testawt com.jogamp.opengl.test.junit.jogl.caps.TestMultisampleAWT #testawt com.jogamp.opengl.test.junit.jogl.awt.TestBug461OffscreenSupersamplingSwingAWT #testawt com.jogamp.opengl.test.junit.jogl.texture.TestGrayTextureFromFileAWTBug417 -testawtmt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $* +#testawtmt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $* # # newt.awt (testawt) @@ -186,6 +190,11 @@ testawtmt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAWT01GLn $* #testawt $* #testnoawt com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen02BitmapNEWT +# + +#testawt com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot +#testawt com.jogamp.opengl.test.junit.newt.TestFocus02SwingAWTRobot +#testawt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListAWT $* $spath/count-edt-start.sh java-run.log |