diff options
| author | Sven Gothel <[email protected]> | 2013-11-18 15:34:42 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2013-11-18 15:34:42 +0100 |
| commit | 3875b4d8e4dcd1b3a0a93283346bea51ecd0a2eb (patch) | |
| tree | bc07adfdeef089e038f327538ebb775ed918092c /make/scripts | |
| parent | 4b134a3bd83e80e6a48bb0dfd893079ca457866e (diff) | |
Bug 890 - GLContextImpl's Version Validation: Only validate Integer based Version if requested context or string-version is >= 3.0
.. otherwise, spec doesn't require integer based version to work!
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/adb-logcat.sh | 2 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/make/scripts/adb-logcat.sh b/make/scripts/adb-logcat.sh index ea4be3d61..443011f84 100755 --- a/make/scripts/adb-logcat.sh +++ b/make/scripts/adb-logcat.sh @@ -1,4 +1,4 @@ sdir=`dirname $0` adb $* logcat -c -adb $* logcat +adb $* logcat 2>&1 | tee adb-logcat.log diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 24c1e6f41..2a97b42bc 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -106,7 +106,7 @@ function jrun() { #D_ARGS="-Djogl.debug.TraceGL -Djogl.debug.DebugGL -Djogl.debug.GLSLCode" #D_ARGS="-Djogl.debug.DebugGL -Djogl.debug.FBObject -Djogl.debug.GLContext -Djogl.debug.GLDrawable -Djogl.debug.GLCanvas -Dnewt.debug.Window" #D_ARGS="-Dnativewindow.debug.GraphicsConfiguration -Djogl.debug.GLDrawable -Djogl.debug.GLContext -Djogl.debug.FBObject" - #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.GLDrawable -Dnativewindow.debug.GraphicsConfiguration" + D_ARGS="-Djogl.debug.GLContext -Djogl.debug.GLDrawable -Dnativewindow.debug.GraphicsConfiguration" #D_ARGS="-Dnativewindow.debug.GraphicsConfiguration" #D_ARGS="-Djogl.debug.GLContext" #D_ARGS="-Djogl.debug.GLContext.NoProfileAliasing" @@ -199,7 +199,7 @@ function jrun() { #D_ARGS="-Dnewt.debug.Window -Djogl.debug.GLDrawable" #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Window.KeyEvent" #D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Window.MouseEvent -Dnewt.debug.Window.KeyEvent" - D_ARGS="-Dnewt.debug.Window" + #D_ARGS="-Dnewt.debug.Window" #D_ARGS="-Xprof" #D_ARGS="-Dnativewindow.debug=all" #D_ARGS="-Djogl.debug.GLCanvas -Djogl.debug.Java2D -Djogl.debug.GLJPanel" @@ -305,7 +305,7 @@ function testawtswt() { #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.opengl.test.junit.jogl.acore.TestGLVersionParsing00NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLCanvasAWT $* @@ -569,7 +569,7 @@ function testawtswt() { #testawt com.jogamp.opengl.test.junit.newt.event.TestNewtEventModifiersNewtCanvasAWT $* #testawtswt com.jogamp.opengl.test.junit.newt.event.TestNewtEventModifiersNewtCanvasSWTAWT $* #testawt com.jogamp.opengl.test.junit.newt.event.TestParentingFocus01SwingAWTRobot $* -testawt com.jogamp.opengl.test.junit.newt.event.TestParentingFocus02SwingAWTRobot $* +#testawt com.jogamp.opengl.test.junit.newt.event.TestParentingFocus02SwingAWTRobot $* #testawt com.jogamp.opengl.test.junit.newt.event.TestParentingFocus03KeyTraversalAWT $* |