diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 37 | ||||
| -rw-r--r-- | make/build-junit.xml | 113 | ||||
| -rw-r--r-- | make/build-newt.xml | 4 | ||||
| -rw-r--r-- | make/scripts/count-lock.sh | 17 | ||||
| -rw-r--r-- | make/scripts/make-runtime-properties.sh | 59 | ||||
| -rw-r--r-- | make/scripts/tests.bat | 5 | ||||
| -rw-r--r--[-rwxr-xr-x] | make/scripts/tests.sh | 126 | ||||
| -rw-r--r-- | make/scripts/tests2.sh | 84 |
8 files changed, 282 insertions, 163 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index 059243101..a00c7f27a 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -175,6 +175,12 @@ <property name="nativewindow.all.jar" value="${build.nativewindow}/nativewindow.all.jar" /> <property name="jogl.all.jar" value="${build.jogl}/jogl.all.jar" /> <property name="newt.all.jar" value="${build.newt}/newt.all.jar" /> + <property name="newt.event.jar" value="${build.newt}/newt.event.jar" /> + + <!-- JavaSE combinations . NO.AWT --> + <property name="nativewindow.all-noawt.jar" value="${build.nativewindow}/nativewindow.all-noawt.jar" /> + <property name="jogl.all-noawt.jar" value="${build.jogl}/jogl.all-noawt.jar" /> + <property name="newt.all-noawt.jar" value="${build.newt}/newt.all-noawt.jar" /> <path id="nativewindow_gluegen.classpath"> <pathelement location="${gluegen-rt.jar}" /> @@ -204,23 +210,40 @@ <pathelement location="${newt.all.jar}" /> </path> - <path id="junit_jogl_newt.run.classpath"> + <path id="junit_jogl_awt.run.classpath"> <pathelement location="${junit.jar}" /> <pathelement location="${ant.jar}" /> <pathelement location="${ant-junit.jar}" /> <pathelement location="${gluegen-rt.jar}" /> <pathelement location="${nativewindow.all.jar}" /> <pathelement location="${jogl.all.jar}" /> - <pathelement location="${newt.all.jar}" /> + <pathelement location="${newt.event.jar}" /> + <pathelement location="${jogl.test.jar}" /> + </path> + + <path id="junit_jogl_newt.run.classpath"> + <pathelement location="${junit.jar}" /> + <pathelement location="${ant.jar}" /> + <pathelement location="${ant-junit.jar}" /> + <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${nativewindow.all-noawt.jar}" /> + <pathelement location="${jogl.all-noawt.jar}" /> + <pathelement location="${newt.all-noawt.jar}" /> <pathelement location="${jogl.test.jar}" /> </path> <property name="junit_jogl_newt.run.jars" - value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${nativewindow.all.jar}${path.separator}${jogl.all.jar}${path.separator}${newt.all.jar}${path.separator}${jogl.test.jar}"/> + value="${junit.jar}${path.separator}${ant.jar}${path.separator}${ant-junit.jar}${path.separator}${gluegen-rt.jar}${path.separator}${nativewindow.all-noawt.jar}${path.separator}${jogl.all-noawt.jar}${path.separator}${newt.all-noawt.jar}${path.separator}${jogl.test.jar}"/> - <!-- JavaSE combinations . NO.AWT --> - <property name="nativewindow.all-noawt.jar" value="${build.nativewindow}/nativewindow.all-noawt.jar" /> - <property name="jogl.all-noawt.jar" value="${build.jogl}/jogl.all-noawt.jar" /> - <property name="newt.all-noawt.jar" value="${build.newt}/newt.all-noawt.jar" /> + <path id="junit_jogl_newt_awt.run.classpath"> + <pathelement location="${junit.jar}" /> + <pathelement location="${ant.jar}" /> + <pathelement location="${ant-junit.jar}" /> + <pathelement location="${gluegen-rt.jar}" /> + <pathelement location="${nativewindow.all.jar}" /> + <pathelement location="${jogl.all.jar}" /> + <pathelement location="${newt.all.jar}" /> + <pathelement location="${jogl.test.jar}" /> + </path> <path id="jogl_newt_all-noawt.classpath"> <pathelement location="${gluegen-rt.jar}" /> diff --git a/make/build-junit.xml b/make/build-junit.xml index 44a0a7866..e9f292e27 100644 --- a/make/build-junit.xml +++ b/make/build-junit.xml @@ -88,38 +88,18 @@ </jar> </target> - <target name="junit.run" depends="junit.compile"> - <!-- Perform the junit tests--> + <target name="junit.run.setup" depends="junit.compile"> <mkdir dir="${results.junit}" /> <delete quiet="true"> <fileset dir="${results.junit}" includes="**"/> </delete> - <condition property="jvmarg.newt" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition> - <condition property="jvmarg.newt" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition> - - <!-- Test*CORE* --> - <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="-Dnewt.debug.EDT"/> - --> - - <formatter usefile="false" type="plain"/> - <formatter usefile="true" type="xml"/> - <classpath refid="junit_jogl_newt.run.classpath"/> - - <batchtest todir="${results.junit}"> - <fileset dir="${classes}"> - <include name="${java.dir.test}/**/Test*CORE*"/> - <exclude name="**/*$$*"/> - </fileset> - <formatter usefile="false" type="brief"/> - <formatter usefile="true" type="xml"/> - </batchtest> - </junit> + <condition property="jvmarg.newt.headless" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition> + <condition property="jvmarg.newt.headless" value="-Djava.awt.headless=true"><not><isset property="isOSX"/></not></condition> + </target> + <!-- NEWT is currently not supported on OSX --> + <target name="junit.run.newt.headless" depends="junit.run.setup" unless="isOSX"> <!-- Test*NEWT* Emulation of junit task, @@ -144,7 +124,7 @@ <packagemapper from="*.class" to="*"/> <!-- FQCN --> </chainedmapper> </pathconvert> - <var name="test.class.result.file" value="${results.junit}/TEST-${test.class.fqn}.xml"/> + <var name="test.class.result.file" value="${results.junit}/TEST-headless-${test.class.fqn}.xml"/> <echo message="Testing ${test.class.fqn} -> ${test.class.result.file}"/> <apply dir="." executable="${java.home}/bin/java" parallel="false" @@ -155,7 +135,7 @@ <env key="${system.env.library.path}" path="${obj.all.paths}"/> <env key="CLASSPATH" value="${junit_jogl_newt.run.jars}"/> <arg value="-Djava.library.path=${obj.all.paths}"/> - <arg line="${jvmarg.newt}"/> + <arg line="${jvmarg.newt.headless}"/> <!-- <arg line="-Dnewt.debug.EDT"/> --> @@ -178,8 +158,12 @@ </apply> </sequential> </for> + </target> - <!-- Test*AWT* --> + <!-- junit.run.newt is covered by junit.run.newt.headless, disable it for now, but may be checked manually --> + <!-- NEWT is currently not supported on OSX --> + <target name="junit.run.newt" depends="junit.run.setup" unless="isOSX"> + <!-- Test*NEWT* --> <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}"/> @@ -203,16 +187,87 @@ <batchtest todir="${results.junit}"> <fileset dir="${classes}"> + <include name="${java.dir.test}/**/Test*NEWT*"/> + <exclude name="**/*$$*"/> + </fileset> + <formatter usefile="false" type="brief"/> + <formatter usefile="true" type="xml"/> + </batchtest> + </junit> + </target> + + <target name="junit.run.awt" depends="junit.run.setup"> + <!-- 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="-Dnewt.debug.EDT"/> + <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="-Dnewt.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_awt.run.classpath"/> + + <batchtest todir="${results.junit}"> + <fileset dir="${classes}"> <include name="${java.dir.test}/**/Test*AWT*"/> <exclude name="**/*$$*"/> + <exclude name="**/newt/**"/> </fileset> <formatter usefile="false" type="brief"/> <formatter usefile="true" type="xml"/> </batchtest> </junit> + </target> + + <!-- NEWT is currently not supported on OSX --> + <target name="junit.run.newt.awt" depends="junit.run.setup" unless="isOSX"> + <!-- 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="-Dnewt.debug.EDT"/> + <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="-Dnewt.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"/> + + <batchtest todir="${results.junit}"> + <fileset dir="${classes}"> + <include name="${java.dir.test}/**/newt/**/Test*AWT*"/> + <exclude name="**/*$$*"/> + </fileset> + <formatter usefile="false" type="brief"/> + <formatter usefile="true" type="xml"/> + </batchtest> + </junit> </target> + <target name="junit.run" depends="junit.run.newt.headless,junit.run.awt,junit.run.newt.awt"/> + <!-- ================================================================== --> <!-- - Build everything. diff --git a/make/build-newt.xml b/make/build-newt.xml index 820c50a3a..5c2ba8d7f 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -692,6 +692,10 @@ <fileset dir="${classes}" includes="com/jogamp/newt/**" /> </jar> + <jar manifest="tempversion" destfile="${newt.event.jar}" filesonly="true"> + <fileset dir="${classes}" + includes="com/jogamp/newt/Display* com/jogamp/newt/Screen* com/jogamp/newt/Window* com/jogamp/newt/ScreenMode* com/jogamp/newt/event/** com/jogamp/newt/impl/Debug*" /> + </jar> </target> <target name="build-jars-all-noawt" depends="setup-manifestfile"> diff --git a/make/scripts/count-lock.sh b/make/scripts/count-lock.sh new file mode 100644 index 000000000..806235f5c --- /dev/null +++ b/make/scripts/count-lock.sh @@ -0,0 +1,17 @@ + +echo lock +grep -RI "lock()" ../src/ | wc +echo unlock +grep -RI "unlock()" ../src/ | wc +echo +echo + +for i in `grep -RIl "unlock()" ../src/` ; do + echo $i + echo lock + grep -RI "lock()" $i | wc + echo unlock + grep -RI "unlock()" $i | wc + echo + echo +done diff --git a/make/scripts/make-runtime-properties.sh b/make/scripts/make-runtime-properties.sh new file mode 100644 index 000000000..f546a93ee --- /dev/null +++ b/make/scripts/make-runtime-properties.sh @@ -0,0 +1,59 @@ +#! /bin/bash + +dest0=../doc/Implementation +dest=../doc/Implementation/runtime-properties-temp + +rm -rf $dest +mkdir $dest + +function cleanup() { + tfile=$1 + shift + ffile=$1 + shift + domain=$1 + shift + + sed -e 's/^.*(\"//g' -i $tfile + sed -e 's/\".*$//g' -i $tfile + sed -e "s/^/$domain/g" -i $tfile + + sort -u $tfile > $ffile + rm -f $tfile +} + +grep -hRI "Debug\.debug" ../../gluegen/src/java/com/jogamp | sort -u > $dest/gluegen-rt.debug.tmp1.txt +cleanup $dest/gluegen-rt.debug.tmp1.txt $dest/gluegen-rt.debug.txt jogamp.debug. +grep -hRI -e "Debug\.isPropertyDefined" -e "Debug\.get" ../../gluegen/src/java/com/jogamp | sort -u > $dest/gluegen-rt.debug.ipd.tmp1.txt +cleanup $dest/gluegen-rt.debug.ipd.tmp1.txt $dest/gluegen-rt.ipd.debug.txt + +grep -hRI "Debug\.debug" ../src/nativewindow | sort -u > $dest/nativewindow.debug.tmp1.txt +cleanup $dest/nativewindow.debug.tmp1.txt $dest/nativewindow.debug.txt nativewindow.debug. +grep -hRI -e "Debug\.isPropertyDefined" -e "Debug\.get" ../src/nativewindow | sort -u > $dest/nativewindow.debug.ipd.tmp1.txt +cleanup $dest/nativewindow.debug.ipd.tmp1.txt $dest/nativewindow.ipd.debug.txt + +grep -hRI "Debug\.debug" ../src/jogl | sort -u > $dest/jogl.debug.all.tmp1.txt +cleanup $dest/jogl.debug.all.tmp1.txt $dest/jogl.debug.all.txt jogl.debug. +grep -hRI -e "Debug\.isPropertyDefined" -e "Debug\.get" ../src/jogl | sort -u > $dest/jogl.debug.ipd.tmp1.txt +cleanup $dest/jogl.debug.ipd.tmp1.txt $dest/jogl.ipd.debug.txt + +grep -hRI "Debug\.debug" ../src/newt | sort -u > $dest/newt.debug.tmp1.txt +cleanup $dest/newt.debug.tmp1.txt $dest/newt.debug.txt newt.debug. +grep -hRI -e "Debug\.isPropertyDefined" -e "Debug\.get" ../src/newt | sort -u > $dest/newt.debug.ipd.tmp1.txt +cleanup $dest/newt.debug.ipd.tmp1.txt $dest/newt.ipd.debug.txt + +function onefile() { + for i in $dest/* ; do + echo $i + echo ---------------------------------------- + sed 's/^/ /g' $i + echo + echo + echo + done +} + +onefile > $dest0/runtime-properties-new.txt + +rm -rf $dest + diff --git a/make/scripts/tests.bat b/make/scripts/tests.bat index 873f039a8..1f3014660 100644 --- a/make/scripts/tests.bat +++ b/make/scripts/tests.bat @@ -1,7 +1,8 @@ -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsNEWT -time 30000 +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT -time 30000 REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.acore.TestGLProfile01CORE -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestParenting01AWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestParenting01AWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01cAWT -time 50000 REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestListenerCom01AWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index b7033d3e1..83c852584 100755..100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -1,49 +1,93 @@ #! /bin/bash +bdir=../build-x86_64 + rm -f java-run.log spath=`dirname $0` -#com.jogamp.test.junit.newt.TestParenting01AWT - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsAWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsNEWT $* -# $spath/java-run-all.sh ../build-x86_64 -Djava.awt.headless=true com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsNEWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestListenerCom01AWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestGLWindows01NEWT $* -# $spath/java-run-all.sh ../build-x86_64 -Djava.awt.headless=true com.jogamp.test.junit.newt.TestGLWindows01NEWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.offscreen.TestOffscreen01NEWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01NEWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02NEWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01aAWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01bAWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cAWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cSwingAWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02AWT $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting03AWT $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.awt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 $* -# $spath/java-run-all.sh ../build-x86_64 -Dnativewindow.debug.ToolkitLock.TraceLock com.jogamp.test.junit.jogl.awt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 $* - -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot $* -# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot $* - -#$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestEventSourceNotAWTBug $* - -#$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestScreenMode01NEWT $* - -$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestScreenMode02NEWT $* - - +. $spath/setenv-jogl.sh $bdir JOGL_ALL + +which java 2>&1 | tee -a java-run.log +java -version 2>&1 | tee -a java-run.log +echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a java-run.log +echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a java-run.log +echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a java-run.log +echo java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log + +function jrun() { + awtarg=$1 + shift + # D_ARGS="-Djogamp.debug.TraceLock" + # 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="-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.EDT -Dnewt.debug.Display -Dnativewindow.debug.X11Util -Djogl.debug.GLDrawable -Djogl.debug.GLCanvas" + #D_ARGS="-Dnewt.debug.EDT -Djogl.debug.GLContext" + D_ARGS="-Dnewt.debug.Screen -Dnewt.debug.EDT -Djogamp.debug.Lock" + #D_ARGS="-Dnewt.debug.EDT" + #D_ARGS="-Dnewt.debug.EDT -Djogl.debug=all -Dnativewindow.debug=all" + # D_ARGS="-Djogl.debug=all" + X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false" + java $awtarg $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log +} + +function testnoawt() { + jrun -Djava.awt.headless=true $* +} + +function testawt() { + jrun -Djava.awt.headless=false $* +} + +# +# newt (testnoawt and testawt) +# +#testnoawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* +#testawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* +#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT +#testawt com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting01NEWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting02NEWT +#testawt com.jogamp.test.junit.newt.TestScreenMode00NEWT +testnoawt com.jogamp.test.junit.newt.TestScreenMode01NEWT +#testnoawt com.jogamp.test.junit.newt.TestScreenMode02NEWT +#testawt com.jogamp.test.junit.newt.TestGLWindows01NEWT +#testawt -Djava.awt.headless=true com.jogamp.test.junit.newt.TestGLWindows01NEWT +#testawt com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated + + +# +# awt (testawt) +# +#testawt com.jogamp.test.junit.jogl.awt.TestAWT01GLn $* +#testawt com.jogamp.test.junit.jogl.awt.TestAWT02WindowClosing +#testawt com.jogamp.test.junit.jogl.awt.TestSwingAWT01GLn +#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsAWT +#testawt com.jogamp.test.junit.jogl.texture.TestTexture01AWT + +# +# newt.awt (testawt) +# +#testawt com.jogamp.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 +#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNewtAWTWrapper +#testawt com.jogamp.test.junit.newt.TestEventSourceNotAWTBug +#testawt com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot +#testawt com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot +#testawt com.jogamp.test.junit.newt.TestListenerCom01AWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting01aAWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting01bAWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting01cAWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting01cSwingAWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting02AWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting03AWT +#testawt com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 +#testawt com.jogamp.test.junit.newt.parenting.TestParenting03bAWT -time 100000 + +#testawt $* $spath/count-edt-start.sh java-run.log + diff --git a/make/scripts/tests2.sh b/make/scripts/tests2.sh deleted file mode 100644 index 9f143e60a..000000000 --- a/make/scripts/tests2.sh +++ /dev/null @@ -1,84 +0,0 @@ -#! /bin/bash - -bdir=../build-x86_64 - -rm -f java-run.log - -spath=`dirname $0` - -. $spath/setenv-jogl.sh $bdir JOGL_ALL - -which java 2>&1 | tee -a java-run.log -java -version 2>&1 | tee -a java-run.log -echo LIBXCB_ALLOW_SLOPPY_LOCK: $LIBXCB_ALLOW_SLOPPY_LOCK 2>&1 | tee -a java-run.log -echo LIBGL_DRIVERS_PATH: $LIBGL_DRIVERS_PATH 2>&1 | tee -a java-run.log -echo LIBGL_DEBUG: $LIBGL_DEBUG 2>&1 | tee -a java-run.log -echo java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log - -function jrun() { - awtarg=$1 - shift - # D_ARGS="-Djogamp.debug.TraceLock" - # 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="-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.EDT -Dnewt.debug.Display -Dnativewindow.debug.X11Util -Djogl.debug.GLDrawable -Djogl.debug.GLCanvas" - #D_ARGS="-Dnewt.debug.EDT -Djogl.debug.GLContext" - D_ARGS="-Dnewt.debug.Screen -Dnewt.debug.EDT -Djogamp.debug.Lock" - #D_ARGS="-Dnewt.debug.EDT" - #D_ARGS="-Dnewt.debug.EDT -Djogl.debug=all -Dnativewindow.debug=all" - # D_ARGS="-Djogl.debug=all" - X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false" - java $awtarg $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log -} - -function testnoawt() { - jrun -Djava.awt.headless=true $* -} - -function testawt() { - jrun -Djava.awt.headless=false $* -} - -#testnoawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* -#testawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* - -#testawt com.jogamp.test.junit.jogl.awt.TestAWT01GLn $* -#testawt com.jogamp.test.junit.jogl.awt.TestAWT02WindowClosing -#testawt com.jogamp.test.junit.jogl.awt.TestSwingAWT01GLn -#testawt com.jogamp.test.junit.jogl.awt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 -#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsAWT -#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsNewtAWTWrapper -#testawt com.jogamp.test.junit.jogl.texture.TestTexture01AWT -#testawt com.jogamp.test.junit.newt.TestEventSourceNotAWTBug -#testawt com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot -#testawt com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot -#testawt com.jogamp.test.junit.newt.TestListenerCom01AWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting01aAWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting01bAWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting01cAWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting01cSwingAWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting02AWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting03AWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 -#testawt com.jogamp.test.junit.newt.parenting.TestParenting03bAWT -time 100000 -#testawt com.jogamp.test.junit.core.TestIteratorIndexCORE - -#testawt com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting01NEWT -#testawt com.jogamp.test.junit.newt.parenting.TestParenting02NEWT - -#testawt com.jogamp.test.junit.newt.TestScreenMode00NEWT -testnoawt com.jogamp.test.junit.newt.TestScreenMode01NEWT -#testnoawt com.jogamp.test.junit.newt.TestScreenMode02NEWT - -#testawt com.jogamp.test.junit.newt.TestGLWindows01NEWT -#testawt -Djava.awt.headless=true com.jogamp.test.junit.newt.TestGLWindows01NEWT -#testawt com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated - -#testawt $* - -$spath/count-edt-start.sh java-run.log |