diff options
| author | Sven Gothel <[email protected]> | 2014-09-02 04:53:30 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-09-02 04:53:30 +0200 |
| commit | 9850c3a91a23983f1261cb38e4734524c67200f2 (patch) | |
| tree | 56ca4ecf34943bb14eb1f1edfabc7d94a31859d3 /make/scripts | |
| parent | c78ceb642d0ef5bb5bf27ff8ff1495175ee2e983 (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')
| -rwxr-xr-x | make/scripts/tests-osx-x64.sh | 3 | ||||
| -rw-r--r-- | make/scripts/tests.sh | 5 |
2 files changed, 5 insertions, 3 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 diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 9de946942..09004d9d8 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -377,7 +377,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLWindowNEWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLCanvasAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $* -testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.acore.TestVersionSemanticsNOUI $* # @@ -440,7 +440,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $* # #testnoawt com.jogamp.opengl.test.junit.jogl.perf.TestPerf001RawInit00NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLJPanelInit01AWT $* -#testawt com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLJPanelInit02AWT $* +testawt com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLJPanelInit02AWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.perf.TestPerf001GLWindowInit03NEWT $* # @@ -731,6 +731,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $* #testawt com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol01AWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $* #testawt com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol03NewtAWT $* +#testawt com.jogamp.opengl.test.junit.newt.TestMultipleNewtCanvasAWT $* #testawt $* |