diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-jogl.xml | 2 | ||||
| -rw-r--r-- | make/build-test.xml | 14 | ||||
| -rwxr-xr-x | make/scripts/tests.sh | 3 |
3 files changed, 17 insertions, 2 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml index 804a29b55..9a4ad8b8e 100644 --- a/make/build-jogl.xml +++ b/make/build-jogl.xml @@ -150,7 +150,7 @@ value="com/jogamp/opengl/**/swt/**"/> <property name="java.part.util" - value="com/jogamp/opengl/util/* com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/packrect/** jogamp/opengl/util/*"/> + value="com/jogamp/opengl/util/* com/jogamp/opengl/util/texture/** com/jogamp/opengl/util/packrect/** jogamp/opengl/util/* jogamp/opengl/util/pngj/**"/> <property name="java.part.util.awt" value="com/jogamp/opengl/util/**/awt/** com/jogamp/opengl/util/AWTAnimatorImpl*"/> diff --git a/make/build-test.xml b/make/build-test.xml index 0a290dcea..96b3f08a4 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -47,6 +47,8 @@ <target name="clean" description="Remove all build products" depends="declare.common"> <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${build.test}" /> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> <fileset file="${jogl.test.jar}" /> </delete> @@ -534,6 +536,8 @@ <mkdir dir="${build}/test/results-x32"/> <move todir="${build}/test/results-x32"> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </move> <move todir="${build}/test/results-x32"> @@ -864,6 +868,8 @@ ${line.separator} <fileset dir="${results.test}" includes="**"/> <fileset dir="${build}/test/results-x32" includes="**"/> <fileset file="${build}/${test.archive.name}.7z"/> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </delete> <mkdir dir="${results.test}" /> @@ -879,6 +885,8 @@ ${line.separator} <target name="junit.run" depends="junit.run.settings, junit.run.if.enabled, junit.run.if.disabled"> <mkdir dir="${results.test}" /> <move todir="${results.test}"> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> @@ -887,6 +895,8 @@ ${line.separator} <target name="junit.manual.run.remote.ssh.newt" depends="junit.run.settings, junit.run.remote.ssh.newt"> <mkdir dir="${results.test}" /> <move todir="${results.test}"> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> @@ -895,6 +905,8 @@ ${line.separator} <target name="junit.manual.run.remote.ssh.awt" depends="junit.run.settings, junit.run.remote.ssh.awt"> <mkdir dir="${results.test}" /> <move todir="${results.test}"> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> @@ -903,6 +915,8 @@ ${line.separator} <target name="junit.manual.run.remote.ssh.all" depends="junit.run.settings, junit.run.remote.ssh.all"> <mkdir dir="${results.test}" /> <move todir="${results.test}"> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 81ff3b7ac..248663a96 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -238,7 +238,8 @@ 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 $* +testnoawt com.jogamp.opengl.test.junit.jogl.util.TestPNGImage01NEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.av.MovieSimple $* # # awt (testawt) |