From 320c4eb1044fac4f5f2b988a88bff5c0d2a5dc26 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 23 Nov 2010 01:38:31 +0100 Subject: Scripts: bump to 6u22; distinguish windows test batch x64/x32 --- make/scripts/java-win32-dbg.bat | 4 ++-- make/scripts/java-win32.bat | 4 ++-- make/scripts/java-win64-dbg.bat | 4 ++-- make/scripts/java-win64.bat | 4 ++-- make/scripts/make.jogl.all.win32.bat | 4 ++-- make/scripts/make.jogl.all.win64.bat | 4 ++-- make/scripts/tests-x32.bat | 31 +++++++++++++++++++++++++++++++ make/scripts/tests-x64.bat | 31 +++++++++++++++++++++++++++++++ make/scripts/tests.bat | 29 ----------------------------- make/scripts/tests.sh | 14 +++++++++----- 10 files changed, 83 insertions(+), 46 deletions(-) create mode 100644 make/scripts/tests-x32.bat create mode 100644 make/scripts/tests-x64.bat delete mode 100644 make/scripts/tests.bat (limited to 'make/scripts') diff --git a/make/scripts/java-win32-dbg.bat b/make/scripts/java-win32-dbg.bat index 856ee3265..92bc62d81 100755 --- a/make/scripts/java-win32-dbg.bat +++ b/make/scripts/java-win32-dbg.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win32 -set J2RE_HOME=c:\jre1.6.0_21_x32 -set JAVA_HOME=c:\jdk1.6.0_21_x32 +set J2RE_HOME=c:\jre1.6.0_22_x32 +set JAVA_HOME=c:\jdk1.6.0_22_x32 set ANT_PATH=C:\apache-ant-1.8.0 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% diff --git a/make/scripts/java-win32.bat b/make/scripts/java-win32.bat index aec1d4697..63d69b8b2 100755 --- a/make/scripts/java-win32.bat +++ b/make/scripts/java-win32.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win32 -set J2RE_HOME=c:\jre1.6.0_21_x32 -set JAVA_HOME=c:\jdk1.6.0_21_x32 +set J2RE_HOME=c:\jre1.6.0_22_x32 +set JAVA_HOME=c:\jdk1.6.0_22_x32 set ANT_PATH=C:\apache-ant-1.8.0 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat index 1d6f02042..72119d1dd 100755 --- a/make/scripts/java-win64-dbg.bat +++ b/make/scripts/java-win64-dbg.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win64 -set J2RE_HOME=c:\jre1.6.0_21_x64 -set JAVA_HOME=c:\jdk1.6.0_21_x64 +set J2RE_HOME=c:\jre1.6.0_22_x64 +set JAVA_HOME=c:\jdk1.6.0_22_x64 set ANT_PATH=C:\apache-ant-1.8.0 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% diff --git a/make/scripts/java-win64.bat b/make/scripts/java-win64.bat index 0dc710105..f1275f46c 100755 --- a/make/scripts/java-win64.bat +++ b/make/scripts/java-win64.bat @@ -1,7 +1,7 @@ set BLD_SUB=build-win64 -set J2RE_HOME=c:\jre1.6.0_21_x64 -set JAVA_HOME=c:\jdk1.6.0_21_x64 +set J2RE_HOME=c:\jre1.6.0_22_x64 +set JAVA_HOME=c:\jdk1.6.0_22_x64 set ANT_PATH=C:\apache-ant-1.8.0 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% diff --git a/make/scripts/make.jogl.all.win32.bat b/make/scripts/make.jogl.all.win32.bat index f3f775cf7..39db2a402 100755 --- a/make/scripts/make.jogl.all.win32.bat +++ b/make/scripts/make.jogl.all.win32.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL" -set J2RE_HOME=c:\jre1.6.0_21_x32 -set JAVA_HOME=c:\jdk1.6.0_21_x32 +set J2RE_HOME=c:\jre1.6.0_22_x32 +set JAVA_HOME=c:\jdk1.6.0_22_x32 set ANT_PATH=C:\apache-ant-1.8.0 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw\bin;%PATH% diff --git a/make/scripts/make.jogl.all.win64.bat b/make/scripts/make.jogl.all.win64.bat index cfd5a1d09..4241d4d5d 100755 --- a/make/scripts/make.jogl.all.win64.bat +++ b/make/scripts/make.jogl.all.win64.bat @@ -1,7 +1,7 @@ set THISDIR="C:\JOGL" -set J2RE_HOME=c:\jre1.6.0_21_x64 -set JAVA_HOME=c:\jdk1.6.0_21_x64 +set J2RE_HOME=c:\jre1.6.0_22_x64 +set JAVA_HOME=c:\jdk1.6.0_22_x64 set ANT_PATH=C:\apache-ant-1.8.0 set PATH=%JAVA_HOME%\bin;%ANT_PATH%\bin;c:\mingw64\bin;c:\mingw\bin;%PATH% diff --git a/make/scripts/tests-x32.bat b/make/scripts/tests-x32.bat new file mode 100644 index 000000000..e8734a053 --- /dev/null +++ b/make/scripts/tests-x32.bat @@ -0,0 +1,31 @@ +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-dbg.bat com.jogamp.test.junit.newt.TestParenting01AWT +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01cAWT -time 50000 +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.TestListenerCom01AWT +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT + +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.TestGLWindows01NEWT +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.nativewindow.TestRecursiveToolkitLockCORE +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 + +REM scripts\java-win32.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.TestScreenMode00NEWT +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.TestScreenMode01NEWT +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.TestScreenMode02NEWT + +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting02NEWT +REM scripts\java-win32.bat com.jogamp.test.junit.newt.TestCloseNewtAWT +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.jogl.caps.TestMultisampleAWT -time 10000 +REM scripts\java-win32-dbg.bat com.jogamp.test.junit.jogl.caps.TestMultisampleNEWT -time 10000 diff --git a/make/scripts/tests-x64.bat b/make/scripts/tests-x64.bat new file mode 100644 index 000000000..620ffa602 --- /dev/null +++ b/make/scripts/tests-x64.bat @@ -0,0 +1,31 @@ +REM scripts\java-win64-dbg.bat com.jogamp.newt.opengl.GLWindow +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 +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411 +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.glsl.TestTransformFeedbackVaryingsBug407NEWT +scripts\java-win64-dbg.bat com.jogamp.test.junit.jogl.glsl.TestGLSLSimple01NEWT -time 2000 + +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 + +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestGLWindows01NEWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.nativewindow.TestRecursiveToolkitLockCORE +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 + +REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode00NEWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode01NEWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode02NEWT + +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting02NEWT +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 diff --git a/make/scripts/tests.bat b/make/scripts/tests.bat deleted file mode 100644 index 475acdf8e..000000000 --- a/make/scripts/tests.bat +++ /dev/null @@ -1,29 +0,0 @@ -REM scripts\java-win64-dbg.bat com.jogamp.newt.opengl.GLWindow -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 -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 - -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestGLWindows01NEWT -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.nativewindow.TestRecursiveToolkitLockCORE -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 - -REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode00NEWT -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode01NEWT -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode02NEWT - -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting02NEWT -REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestCloseNewtAWT -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 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 8304b99b6..9fa455663 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -24,7 +24,7 @@ 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.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" @@ -37,6 +37,7 @@ function jrun() { #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.GraphicsConfiguration" #X_ARGS="-Dsun.java2d.noddraw=true -Dsun.java2d.opengl=false" java $awtarg $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log } @@ -53,15 +54,17 @@ function testawt() { # newt (testnoawt and testawt) # #testnoawt com.jogamp.newt.opengl.GLWindow $* -#testnoawt com.jogamp.test.junit.newt.TestRemoteWindow01NEWT -time 1000000 -#testnoawt com.jogamp.test.junit.newt.TestRemoteGLWindows01NEWT -time 1000000 -#testawt javax.media.opengl.awt.GLCanvas $* +#testawt com.jogamp.newt.opengl.GLWindow $* #testnoawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* #testawt com.jogamp.test.junit.jogl.acore.TestGLProfile01NEWT $* +#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.newt.TestDisplayLifecycle01NEWT #testawt com.jogamp.test.junit.newt.TestDisplayLifecycle02NEWT -testawt com.jogamp.test.junit.newt.parenting.TestParenting01NEWT +#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 @@ -74,6 +77,7 @@ testawt com.jogamp.test.junit.newt.parenting.TestParenting01NEWT # # awt (testawt) # +#testawt javax.media.opengl.awt.GLCanvas $* #testawt com.jogamp.test.junit.jogl.awt.TestAWT01GLn $* #testawt com.jogamp.test.junit.jogl.awt.TestAWT02WindowClosing #testawt com.jogamp.test.junit.jogl.awt.TestSwingAWT01GLn -- cgit v1.2.3