diff options
| author | Sven Gothel <[email protected]> | 2019-04-05 08:54:13 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-04-05 08:54:13 +0200 |
| commit | 2280e821ea5f8e02fb99cf3f12e10115d6d4f13a (patch) | |
| tree | 75afc48854e4802be9aa515d4953f0315249f1a5 | |
| parent | 56a3ea2077483925cb7da7729fe3afa4da498929 (diff) | |
Bug 1362: Test against SWT 4.3 and 4.11
4.3 is still working w/ GTK2
4.11 is not working as described by Wade
| -rwxr-xr-x | make/scripts/tests-x64.sh | 3 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index c12be29df..223c08f5c 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -27,7 +27,8 @@ if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh fi -export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86_64/swt.jar +#export SWT_CLASSPATH=`pwd`/lib/swt/gtk-linux-x86_64/swt.jar +export SWT_CLASSPATH=/usr/local/projects/JOGL/SWT/swt-4.3.0/gtk-linux-x86_64/swt-debug.jar . $SDIR/tests.sh `which java` -d64 ../build-x86_64 $* diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 98326eace..135257fa5 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -145,6 +145,7 @@ function jrun() { #D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.TraceGL" #D_ARGS="-Djogl.debug.GLSLCode -Djogl.debug.DebugGL" #D_ARGS="-Djogl.debug.GLContext -Dnativewindow.debug.JAWT -Dnewt.debug.Window" + D_ARGS="-Dnativewindow.debug.SWT -Djogl.debug.GLCanvas" #D_ARGS="-Dnativewindow.debug.JAWT -Djogl.debug.GLCanvas" #D_ARGS="-Dnativewindow.debug.JAWT -Djogamp.debug.TaskBase.TraceSource" #D_ARGS="-Dnativewindow.debug.JAWT" @@ -756,12 +757,12 @@ function testawtswt() { # SWT (testswt) # #testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTEclipseGLCanvas01GLn $* -#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn $* +testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn $* #testswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn $* #testswt com.jogamp.opengl.test.junit.jogl.swt.TestBug672NewtCanvasSWTSashForm $* #testswt com.jogamp.opengl.test.junit.jogl.swt.TestBug672NewtCanvasSWTSashFormComposite $* #testswt com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextVBOES2SWT3 $* -testswt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasSWT $* +#testswt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasSWT $* #testswt com.jogamp.opengl.test.junit.jogl.demos.es2.swt.TestGearsES2SWT $* # |