diff options
| author | Sven Gothel <[email protected]> | 2019-04-05 22:22:32 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-04-05 22:22:32 +0200 |
| commit | ab10b11a9c94d9597f788e218fe45ede49c67f33 (patch) | |
| tree | 47ac6fb9068c3504e6de2a9e4e7576c742b31916 /make/scripts | |
| parent | 2280e821ea5f8e02fb99cf3f12e10115d6d4f13a (diff) | |
Bug 1362: Wrong 'fake' swt.jar config for isLinuxARM64, isLinuxARMv6 and isAndroid
We intend to attach a non-matching swt.jar for these build nodes,
to at least pass the javac pass w/o testing on those platforms.
Diffstat (limited to 'make/scripts')
| -rwxr-xr-x | make/scripts/tests-x64.sh | 4 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh index 223c08f5c..52216502f 100755 --- a/make/scripts/tests-x64.sh +++ b/make/scripts/tests-x64.sh @@ -27,8 +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=/usr/local/projects/JOGL/SWT/swt-4.3.0/gtk-linux-x86_64/swt-debug.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 135257fa5..58142e117 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -118,6 +118,7 @@ function jrun() { #D_ARGS="-Djogamp.debug.ProcAddressHelper -Djogamp.debug.NativeLibrary -Djogamp.debug.NativeLibrary.Lookup -Djogamp.debug.JNILibLoader -Djogamp.debug.TempJarCache -Djogamp.debug.JarUtil -Djogl.glu.nojava=true" #D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" + D_ARGS="-Dnativewindow.debug.SWT -Dnativewindow.debug.X11Util -Dnewt.debug.Window" #D_ARGS="-Dnativewindow.debug=all -Dnewt.debug.Window" #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all -Dnewt.debug=all -Djogamp.debug.Lock" @@ -145,7 +146,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.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" @@ -757,12 +758,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 $* # |