diff options
Diffstat (limited to 'make/scripts')
-rwxr-xr-x | make/scripts/tests-osx-aarch64.sh | 21 | ||||
-rwxr-xr-x | make/scripts/tests-osx-x64.sh | 6 | ||||
-rw-r--r-- | make/scripts/tests.sh | 6 |
3 files changed, 27 insertions, 6 deletions
diff --git a/make/scripts/tests-osx-aarch64.sh b/make/scripts/tests-osx-aarch64.sh new file mode 100755 index 000000000..ad9e289e4 --- /dev/null +++ b/make/scripts/tests-osx-aarch64.sh @@ -0,0 +1,21 @@ +#! /bin/bash + +#export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$DYLD_LIBRARY_PATH +#export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.8/lib:$DYLD_LIBRARY_PATH +#export DYLD_LIBRARY_PATH=/usr/local/Cellar/ffmpeg/4.1.2/lib:$DYLD_LIBRARY_PATH + +#JAVA_HOME=`/usr/libexec/java_home` +#JAVA_HOME=`/usr/libexec/java_home -version 1.8` +#JAVA_HOME=`/usr/libexec/java_home -version 11` +JAVA_HOME=`/usr/libexec/java_home -version 17` +PATH=$JAVA_HOME/bin:$PATH +export JAVA_HOME PATH + +export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-aarch64/swt.jar + +spath=`dirname $0` + +ulimit -c unlimited + +. $spath/tests.sh $JAVA_HOME/bin/java --illegal-access=warn ../build-macosx $* + diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh index 4f225b7c0..06b17df3c 100755 --- a/make/scripts/tests-osx-x64.sh +++ b/make/scripts/tests-osx-x64.sh @@ -1,8 +1,8 @@ #! /bin/bash -#export DYLD_LIBRARY_PATH=$HOME/ffmpeg-0.8_0.9/lib:$DYLD_LIBRARY_PATH #export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$DYLD_LIBRARY_PATH -#export DYLD_LIBRARY_PATH=/usr/local/Cellar/ffmpeg/2.8/lib:$DYLD_LIBRARY_PATH +#export DYLD_LIBRARY_PATH=$HOME/ffmpeg-2.8/lib:$DYLD_LIBRARY_PATH +#export DYLD_LIBRARY_PATH=/usr/local/Cellar/ffmpeg/4.1.2/lib:$DYLD_LIBRARY_PATH #JAVA_HOME=`/usr/libexec/java_home` #JAVA_HOME=`/usr/libexec/java_home -version 1.8` @@ -11,7 +11,7 @@ JAVA_HOME=`/usr/libexec/java_home -version 17` PATH=$JAVA_HOME/bin:$PATH export JAVA_HOME PATH -# export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-x86_64/swt.jar +export SWT_CLASSPATH=`pwd`/lib/swt/cocoa-macosx-x86_64/swt.jar spath=`dirname $0` diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index eb602e6aa..714a79776 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -156,7 +156,7 @@ function jrun() { #D_ARGS="-Dnativewindow.debug=all -Djogl.debug=all -Dnewt.debug=all" #D_ARGS="-Dnativewindow.debug.SWT" - #D_ARGS="-Dnativewindow.debug.SWT -Dnewt.debug.Window -Djogl.debug.GLCanvas" + D_ARGS="-Dnativewindow.debug.SWT -Dnewt.debug.Window -Djogl.debug.GLCanvas" #D_ARGS="-Dnativewindow.debug.SWT -Dnewt.debug.Window -Djogl.debug.GLCanvas -Dswt.autoScale=200" #export GDK_DPI_SCALE=2 #D_ARGS="-Dnativewindow.debug.SWT -Dnativewindow.debug.X11Util -Dnewt.debug.Window" @@ -495,7 +495,7 @@ function testawtswt() { #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NewtCanvasAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* -testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* +#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawtatomics com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $* @@ -778,7 +778,7 @@ testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* # #testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor01 $* #testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTAccessor02NewtGLWindow $* -#testswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn $* +testswt com.jogamp.opengl.test.junit.jogl.swt.TestNewtCanvasSWTGLn $* #testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTJOGLGLCanvas01GLn $* #testswt com.jogamp.opengl.test.junit.jogl.demos.es2.swt.TestGearsES2SWT $* #testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTEclipseGLCanvas01GLn $* |