summaryrefslogtreecommitdiffstats
path: root/make/scripts/tests-osx-x64.sh
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-09-02 04:53:30 +0200
committerSven Gothel <[email protected]>2014-09-02 04:53:30 +0200
commit9850c3a91a23983f1261cb38e4734524c67200f2 (patch)
tree56ca4ecf34943bb14eb1f1edfabc7d94a31859d3 /make/scripts/tests-osx-x64.sh
parentc78ceb642d0ef5bb5bf27ff8ff1495175ee2e983 (diff)
Bug 1048: Add unit tests demonstrating multiple NewtCanvasAWT instances are working
Enhance following performance test cases, adding NewtCanvasAWT, beside GLCanvas and GLJPanel, 25 instances: com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLJPanelInit01AWT com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLJPanelInit02AWT Adding simple com.jogamp.opengl.test.junit.newt.TestMultipleNewtCanvasAWT w/ two instances. Manually tested on GNU/Linux and OSX (java7 and java8).
Diffstat (limited to 'make/scripts/tests-osx-x64.sh')
-rwxr-xr-xmake/scripts/tests-osx-x64.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/make/scripts/tests-osx-x64.sh b/make/scripts/tests-osx-x64.sh
index 3828806d8..c95c69bed 100755
--- a/make/scripts/tests-osx-x64.sh
+++ b/make/scripts/tests-osx-x64.sh
@@ -3,7 +3,8 @@
#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
-JAVA_HOME=`/usr/libexec/java_home -version 1.7`
+JAVA_HOME=`/usr/libexec/java_home -version 1.8`
+#JAVA_HOME=`/usr/libexec/java_home -version 1.7`
#JAVA_HOME=`/usr/libexec/java_home -version 1.7.0_25`
#JAVA_HOME=`/usr/libexec/java_home -version 1.6.0`
PATH=$JAVA_HOME/bin:$PATH