diff options
| author | Sven Gothel <[email protected]> | 2010-09-25 15:06:26 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2010-09-25 15:06:26 +0200 |
| commit | bcad73dccb1cd0c32e3a77b3406ddc74e8f2e4ac (patch) | |
| tree | aac1f157781e4243acba7d11622344b6b84dafcf /make | |
| parent | 1c02f0eeb539ff5de7259b822893ab63a9cc3ab0 (diff) | |
Unit test for Bug 411 (Pre AWT/Swing Usage, Mixed usage with JOGL) - GLCanvas NPE fix - NewtCanvasAWT added destroy(..)
Unit test for Bug 411 (Pre AWT/Swing Usage, Mixed usage with JOGL):
Added exhausting Pre AWT/Swing usage test utilizing a later JOGL init
with GLCanvas and NEWTCanvasAWT.
This works for NV+X11+Ubuntu+64bit, have to do more testing.
GLCanvas NPE fix at destroy/dispose, check if already destroyed, ie context==null
NewtCanvasAWT: Add destroy() and destroy(boolean unrecoverable)
Diffstat (limited to 'make')
| -rwxr-xr-x | make/scripts/deploy-jnlp-webstarttest-filter.sh | 2 | ||||
| -rwxr-xr-x | make/scripts/java-run-all.sh | 1 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/make/scripts/deploy-jnlp-webstarttest-filter.sh b/make/scripts/deploy-jnlp-webstarttest-filter.sh index 58191bcb7..77eda44c8 100755 --- a/make/scripts/deploy-jnlp-webstarttest-filter.sh +++ b/make/scripts/deploy-jnlp-webstarttest-filter.sh @@ -20,6 +20,6 @@ mkdir orig-jnlp for i in *.jnlp ; do mv $i orig-jnlp - sed -e 's/<security>//g' -e 's/<\/security>//g' -e 's/<all-permissions\/>//g' orig/$i > $i + sed -e 's/<security>//g' -e 's/<\/security>//g' -e 's/<all-permissions\/>//g' orig-jnlp/$i > $i done diff --git a/make/scripts/java-run-all.sh b/make/scripts/java-run-all.sh index c7eb15ed6..bc0a61cab 100755 --- a/make/scripts/java-run-all.sh +++ b/make/scripts/java-run-all.sh @@ -46,6 +46,7 @@ uname -a | grep -i Darwin && MOSX=1 # D_ARGS="-Dnewt.debug=all" # 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" # D_ARGS="-Dnewt.debug.Display" # D_ARGS="-Djogl.debug.Animator -Dnewt.debug.Window -Dnewt.debug.Display" diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 7a8f514d1..6aea63c3a 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -19,10 +19,12 @@ spath=`dirname $0` # $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.TestParenting01aAWT $* # $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.TestParenting01bAWT $* # $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.jogl.awt.TestSwingAWTUsageBeforeJOGLInitBug411 $* + $spath/count-edt-start.sh java-run.log |