diff options
| author | Sven Gothel <[email protected]> | 2012-04-06 03:56:18 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-04-06 03:56:18 +0200 |
| commit | 9bb8fe7c2baff185a62cf4806cfa34dfad4f7a4c (patch) | |
| tree | 021d9139845ff9f91c5d8fa8e5354a8d30d67182 /make | |
| parent | 7c78d722afab67a90bf92cdd29244398d1f3e5cd (diff) | |
GLMediaPlayer: Add (c) tag; Add NullGLMediaPlayer (dummy texture);
- Factory falls back to NullGLMediaPlayer allowing to test on platforms where no player is available.
- MovieSimple (c) to JogAmp since it is no more derived from the old project.
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-test.xml | 3 | ||||
| -rw-r--r-- | make/resources/assets-test/data/av/test-ntsc01-640x360.tga | bin | 0 -> 921644 bytes | |||
| -rwxr-xr-x | make/scripts/tests.sh | 3 |
3 files changed, 5 insertions, 1 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 19e61e066..a69124672 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -58,6 +58,7 @@ --> <target name="android.test.package" if="isAndroid"> <aapt.signed + assetsdir="resources/assets-test" jarsrcdir="${src}/test" jarbuilddir="${jar}" jarbasename="jogl.test" @@ -97,6 +98,8 @@ to get the same resource file twice in the jar) --> <fileset dir="${classes}" includes="${java.part.test}"/> + <fileset dir="resources/assets-test" + includes="**" /> </jar> </target> diff --git a/make/resources/assets-test/data/av/test-ntsc01-640x360.tga b/make/resources/assets-test/data/av/test-ntsc01-640x360.tga Binary files differnew file mode 100644 index 000000000..71ca3550c --- /dev/null +++ b/make/resources/assets-test/data/av/test-ntsc01-640x360.tga diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 688fd52a0..81ff3b7ac 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -238,6 +238,7 @@ function testawtswt() { #testnoawt -Djava.awt.headless=true com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT #testnoawt com.jogamp.opengl.test.junit.jogl.util.TestGLReadBufferUtilTextureIOWrite01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.util.TestGLReadBufferUtilTextureIOWrite02NEWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* # # awt (testawt) @@ -258,7 +259,7 @@ function testawtswt() { #testawt com.jogamp.opengl.test.junit.jogl.awt.TestAWT03GLCanvasRecreate01 $* #testawt com.jogamp.opengl.test.junit.jogl.awt.TestAWT02WindowClosing #testawt com.jogamp.opengl.test.junit.jogl.awt.text.TestAWTTextRendererUseVertexArrayBug464 -testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT $* +#testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWTAnalyzeBug455 $* #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsGLJPanelAWT $* |