diff options
author | Sven Gothel <[email protected]> | 2010-11-02 23:12:37 +0100 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2010-11-02 23:12:37 +0100 |
commit | af3de7dd59bcebde68f3928868b5dde198978854 (patch) | |
tree | 3ccea0a38562b47b6ff11100967c82bcc1fc0b2e /make | |
parent | 81c02065e28113ffed021b0c69cccc3d4747c6b1 (diff) |
Minor cleanup: strings, unused vars, ..
DEBUG strings w/ thread name
nativewindow.TraceLock -> nativewindow.debug.ToolkitLock.TraceLock
Sync Xmisc (DummyWindow) with NEWT's creation
test scripts: awt and non-awt usage
Diffstat (limited to 'make')
-rwxr-xr-x | make/scripts/java-run-all.sh | 4 | ||||
-rwxr-xr-x | make/scripts/tests.sh | 2 | ||||
-rw-r--r-- | make/scripts/tests2.sh | 20 |
3 files changed, 17 insertions, 9 deletions
diff --git a/make/scripts/java-run-all.sh b/make/scripts/java-run-all.sh index d28c0953c..aeda83ffb 100755 --- a/make/scripts/java-run-all.sh +++ b/make/scripts/java-run-all.sh @@ -49,8 +49,8 @@ uname -a | grep -i Darwin && MOSX=1 # D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT" # D_ARGS="-Dnewt.debug.EDT -Dnewt.debug.Window" # D_ARGS="-Dsun.awt.disableMixing=true -Dnewt.debug.EDT" -D_ARGS="-Dnewt.debug.EDT -Dnativewindow.TraceLock" -# D_ARGS="-Djogamp.debug.TraceLock" +D_ARGS="-Dnewt.debug.EDT -Dnativewindow.debug.ToolkitLock.TraceLock" +# D_ARGS="-Djogamp.debug.Lock.TraceLock" # D_ARGS="-Dnewt.debug.Display" # D_ARGS="-Djogl.debug.Animator -Dnewt.debug.Window -Dnewt.debug.Display" # D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.test.Window.reparent.incompatible=true" diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 7246a7ec4..b7033d3e1 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -33,7 +33,7 @@ spath=`dirname $0` # $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.TraceLock=true 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 $* diff --git a/make/scripts/tests2.sh b/make/scripts/tests2.sh index cce1c3e19..19ecb123a 100644 --- a/make/scripts/tests2.sh +++ b/make/scripts/tests2.sh @@ -16,27 +16,35 @@ 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.TraceLock -Dnativewindow.debug.NativeWindow" + # 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.TraceLock -Dnativewindow.debug.X11Util.TraceDisplayLifecycle=true" + # 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" - D_ARGS="-Dnewt.debug.EDT" + #D_ARGS="-Dnewt.debug.EDT" + D_ARGS="-Dnewt.debug.EDT -Djogl.debug=all -Dnativewindow.debug=all" # D_ARGS="-Djogl.debug=all" - java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log + java $awtarg $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log } +function testnoawt() { + jrun -Djava.awt.headless=true $* +} function testawt() { - jrun $* + 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 @@ -46,7 +54,7 @@ function testawt() { #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.TestFocus02SwingAWTRobot #testawt com.jogamp.test.junit.newt.TestListenerCom01AWT #testawt com.jogamp.test.junit.newt.parenting.TestParenting01aAWT #testawt com.jogamp.test.junit.newt.parenting.TestParenting01bAWT |