script updates

7 files changed, 49 insertions, 12 deletions

diff --git a/make/scripts/java-win32-dbg.bat b/make/scripts/java-win32-dbg.bat
index 92bc62d81..e9a249406 100755
--- a/make/scripts/java-win32-dbg.bat
+++ b/make/scripts/java-win32-dbg.bat
@@ -17,7 +17,8 @@ REM set D_ARGS="-Djogamp.debug.JNILibLoader=true" "-Djogamp.debug.NativeLibrary=
 REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all"

 REM set D_ARGS="-Dnewt.debug.Window" "-Dnativewindow.debug.TraceLock"

 REM set D_ARGS="-Dnativewindow.debug.TraceLock"

-set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display"

+REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display"

+set D_ARGS="-Djogl.debug=all"

 REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display" "-Dnewt.test.Window.reparent.incompatible=true"

 

 set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"

diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat
index 1abce8f02..a2df18253 100755
--- a/make/scripts/java-win64-dbg.bat
+++ b/make/scripts/java-win64-dbg.bat
@@ -18,7 +18,8 @@ REM set D_ARGS="-Djogl.debug.GLContext" "-Djogl.debug.ExtensionAvailabilityCache
 REM set D_ARGS="-Djogl.debug.GraphicsConfiguration"

 REM set D_ARGS="-Djogamp.debug.JNILibLoader=true" "-Djogamp.debug.NativeLibrary=true" "-Djogamp.debug.NativeLibrary.Lookup=true" "-Djogl.debug.GLProfile=true"

 REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all" "-Djogamp.debug.Lock" "-Djogamp.debug.Lock.TraceLock"

-set D_ARGS="-Djogl.debug=all"

+set D_ARGS="-Djogl.debug=all" "-Dnativewindow.debug=all"

+REM set D_ARGS="-Djogl.debug.GLContext" "-Dnewt.debug=all"

 REM set D_ARGS="-Dnewt.debug.Window" "-Dnativewindow.debug.TraceLock"

 REM set D_ARGS="-Dnativewindow.debug.TraceLock"

 REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display"

diff --git a/make/scripts/tests-javaws-x64.bat b/make/scripts/tests-javaws-x64.bat
index 5990d06a1..bc0f8a7f5 100644
--- a/make/scripts/tests-javaws-x64.bat
+++ b/make/scripts/tests-javaws-x64.bat
@@ -1,9 +1,18 @@
 set JRE_PATH=C:\jre1.6.0_22_x64\bin
+set LOG_PATH=%USERPROFILE%\AppData\LocalLow\Sun\Java\Deployment\log
+
 %JRE_PATH%\javaws -uninstall
+del /F /Q %LOG_PATH%\*.*
 
 set JNLP=Gears.jnlp
 REM set JNLP=TextCube.jnlp
 REM set JNLP=JRefractNoOGL.jnlp
 
-%JRE_PATH%\javaws -J-verbose:class -J-verbose:jni -J-Dsun.java2d.noddraw=true -J-Dsun.awt.noerasebackground=true -J-Dsun.java2d.opengl=false -J-Djnlp.jogl.debug=all http://risa/deployment/test/jau01s/jogl-demos/%JNLP% > tests-javaws.log 2>&1
+set D_FLAGS="-J-Djnlp.nativewindow.debug=all" "-J-Djnlp.jogl.debug=all" "-J-Djnlp.newt.debug=all"
+
+REM set X_FLAGS="-J-Dsun.java2d.noddraw=true" "-J-Dsun.awt.noerasebackground=true" "-J-Dsun.java2d.opengl=false"
+REM set X_FLAGS="-J-verbose:jni"
+set X_FLAGS=
+
+%JRE_PATH%\javaws %X_FLAGS% %D_FLAGS% http://risa/deployment/test/jau01s/jogl-demos/%JNLP% > tests-javaws.log 2>&1
 
diff --git a/make/scripts/tests-javaws.sh b/make/scripts/tests-javaws.sh
index 467b9255d..a1b1b1e2e 100644
--- a/make/scripts/tests-javaws.sh
+++ b/make/scripts/tests-javaws.sh
@@ -1,8 +1,16 @@
 javaws -uninstall
 
+rm -f ~/.java/deployment/log/*
+
 JNLP=Gears.jnlp
 # JNLP=TextCube.jnlp
 # JNLP=JRefractNoOGL.jnlp
 
-javaws -J-verbose:class -J-verbose:jni -J-Dsun.java2d.noddraw=true -J-Dsun.awt.noerasebackground=true -J-Dsun.java2d.opengl=false -J-Djnlp.jogl.debug=all http://risa/deployment/test/jau01s/jogl-demos/$JNLP 2>&1 | tee tests-javaws.log
+D_FLAGS="-J-Djnlp.nativewindow.debug=all -J-Djnlp.jogl.debug=all -J-Djnlp.newt.debug=all"
+
+#X_FLAGS="-J-Dsun.java2d.noddraw=true -J-Dsun.awt.noerasebackground=true -J-Dsun.java2d.opengl=false"
+#X_FLAGS="-J-verbose:jni"
+X_FLAGS=
+
+javaws $X_FLAGS $D_FLAGS http://risa/deployment/test/jau01s/jogl-demos/$JNLP 2>&1 | tee tests-javaws.log
 
diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat
index e8734a053..f1ea96484 100644
--- a/make/scripts/tests-x32.bat
+++ b/make/scripts/tests-x32.bat
@@ -1,9 +1,10 @@
+scripts\java-win32-dbg.bat com.jogamp.newt.opengl.GLWindow
 REM scripts\java-win32-dbg.bat com.jogamp.newt.opengl.GLWindow
 REM scripts\java-win32-dbg.bat com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT
 REM scripts\java-win32-dbg.bat com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT -time 30000
 REM scripts\java-win32-dbg.bat com.jogamp.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411
 REM scripts\java-win32-dbg.bat com.jogamp.test.junit.jogl.glsl.TestTransformFeedbackVaryingsBug407NEWT
-scripts\java-win32.bat com.jogamp.test.junit.jogl.glsl.TestGLSLSimple01NEWT -time 2000
+REM scripts\java-win32.bat com.jogamp.test.junit.jogl.glsl.TestGLSLSimple01NEWT -time 2000
 
 REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.TestParenting01AWT
 REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01cAWT -time 50000
diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat
index a801feffb..80c7b5fee 100644
--- a/make/scripts/tests-x64.bat
+++ b/make/scripts/tests-x64.bat
@@ -1,8 +1,12 @@
-scripts\java-win64-dbg.bat com.jogamp.newt.opengl.GLWindow
-REM scripts\java-win64.bat com.jogamp.test.junit.jogl.awt.TestAWT01GLn
+REM scripts\java-win64-dbg.bat com.jogamp.newt.opengl.GLWindow
+REM scripts\java-win64-dbg.bat javax.media.opengl.awt.GLCanvas
+REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.awt.TestAWT01GLn
 REM scripts\java-win64.bat com.jogamp.test.junit.jogl.awt.TestSwingAWT01GLn
+REM scripts\java-win64.bat com.jogamp.test.junit.jogl.acore.TestSharedContextListAWT -time 5000
+REM scripts\java-win64.bat com.jogamp.test.junit.jogl.acore.TestSharedContextListNEWT -time 5000
 REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT
-REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT -time 30000
+
+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.demos.gl2.gears.TestGearsGLJPanelAWT -time 5000
 REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.awt.TestAWT03GLCanvasRecreate01
 REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411
@@ -33,3 +37,7 @@ REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParentin
 REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestCloseNewtAWT
 REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.caps.TestMultisampleAWT -time 10000
 REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.caps.TestMultisampleNEWT -time 10000
+
+REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT -time 2000
+REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.awt.TestAWT03GLCanvasRecreate01 -time 2000
+REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 -time 2000
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 3bfaf7247..f96a1dc71 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -32,14 +32,17 @@ function jrun() {
     # 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="-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"
+    #D_ARGS="-Djogl.debug=all -Dnewt.debug=all"
+    #D_ARGS="-Dnewt.debug=all"
+    D_ARGS="-Dnativewindow.debug=all"
     #D_ARGS="-Djogl.debug.GraphicsConfiguration"
     #D_ARGS="-Djogl.debug.GLCanvas"
     #X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=true"
+    #X_ARGS="-verbose:jni"
     echo
     echo "Test Start: $*"
     echo
@@ -63,14 +66,15 @@ function testawt() {
 #testnoawt com.jogamp.nativewindow.NativeWindowVersion $*
 #testnoawt com.jogamp.opengl.JoglVersion $*
 #testnoawt com.jogamp.newt.NewtVersion $*
-testnoawt com.jogamp.newt.opengl.GLWindow $*
+#testnoawt com.jogamp.newt.opengl.GLWindow $*
 #testnoawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $*
 #testawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $*
+#testawt com.jogamp.test.junit.jogl.acore.TestSharedContextListNEWT $*
 #testnoawt com.jogamp.test.junit.jogl.glsl.TestTransformFeedbackVaryingsBug407NEWT $*
 #testnoawt com.jogamp.test.junit.jogl.glsl.TestGLSLSimple01NEWT $*
 #testnoawt com.jogamp.test.junit.newt.TestRemoteWindow01NEWT -time 1000000
 #testnoawt com.jogamp.test.junit.newt.TestRemoteGLWindows01NEWT -time 1000000
-#testawt com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT
+testawt com.jogamp.test.junit.jogl.demos.gl2.gears.newt.TestGearsNEWT $*
 #testawt com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT
 #testawt com.jogamp.test.junit.newt.TestDisplayLifecycle02NEWT
 #testawt com.jogamp.test.junit.newt.parenting.TestParenting01NEWT
@@ -88,6 +92,7 @@ testnoawt com.jogamp.newt.opengl.GLWindow $*
 #
 #testawt javax.media.opengl.awt.GLCanvas $*
 #testawt com.jogamp.test.junit.jogl.awt.TestAWT01GLn $*
+#testawt com.jogamp.test.junit.jogl.acore.TestSharedContextListAWT $*
 #testawt com.jogamp.test.junit.jogl.awt.TestSwingAWT01GLn
 #testawt com.jogamp.test.junit.jogl.awt.TestAWT03GLCanvasRecreate01 $*
 #testawt com.jogamp.test.junit.jogl.awt.TestAWT02WindowClosing
@@ -122,5 +127,9 @@ testnoawt com.jogamp.newt.opengl.GLWindow $*
 
 #testawt $*
 
+#testawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $*
+#testawt com.jogamp.test.junit.jogl.awt.TestAWT03GLCanvasRecreate01 -time 2000
+#testawt com.jogamp.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411
+
 $spath/count-edt-start.sh java-run.log