diff options
| author | Sven Gothel <[email protected]> | 2014-02-23 15:40:49 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2014-02-23 15:40:49 +0100 |
| commit | f69df875d0b9f969a816d143ed589b25e50cd9e7 (patch) | |
| tree | 0c42a7430d1cf02a60c19a8b6046303dd41da414 /make | |
| parent | 3352601e0860584509adf2b76f993d03893ded4b (diff) | |
Bug 801: Graph TextRenderer Cleanup Part-1b (clean)
Concludes commit f51933f0ebe9ae030c26c066e59a728ce08b8559
w/ final fixes on merge commit 3352601e0860584509adf2b76f993d03893ded4b.
Diffstat (limited to 'make')
| -rw-r--r-- | make/scripts/tests.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 65e11b4ab..8b1b79771 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -370,7 +370,7 @@ function testawtswt() { #testnoawt jogamp.opengl.openal.av.ALDummyUsage $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* -testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.CrossFadePlayer $* +#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.CrossFadePlayer $* # # performance tests @@ -725,19 +725,14 @@ testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.CrossFadePlayer $* #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState02NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $* -<<<<<<< HEAD -#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWTPerf01 $* -#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT10 $* -testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $* -======= # # Graph # -#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT10 $* ->>>>>>> master #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT00 $* -#testnoawt com.jogamp.opengl.test.junit.graph.TestRegionRendererNEWT01 $* +testnoawt com.jogamp.opengl.test.junit.graph.TestRegionRendererNEWT01 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $* +#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWTPerf01 $* +#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT10 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.ui.UINewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo02 $* @@ -745,6 +740,8 @@ testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT20 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo02 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo01 $* #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo02 $* +#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieCube $* +#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* # # OSX bugs |