diff options
Diffstat (limited to 'make/build-test.xml')
| -rw-r--r-- | make/build-test.xml | 342 |
1 files changed, 271 insertions, 71 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index d1175f3dd..eed264e6b 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -28,6 +28,7 @@ <property name="java.part.test.all" value="com/jogamp/** jogamp/**"/> <property name="java.part.test.android" value="com/jogamp/opengl/test/android/**"/> + <property name="java.part.test.oculusvr" value="com/jogamp/opengl/test/junit/jogl/stereo/ovr/**"/> <property name="java.dir.test" value="com/jogamp/opengl/test"/> <property name="java.dir.junit" value="${java.dir.test}/junit"/> <property name="java.dir.bugs" value="${java.dir.test}/bugs"/> @@ -48,9 +49,12 @@ <target name="clean" description="Remove all build products" depends="declare.common"> <delete includeEmptyDirs="true" quiet="true"> <fileset dir="${build.test}" /> + <fileset dir="." includes="*.ps" /> + <fileset dir="." includes="*.pdf" /> <fileset dir="." includes="*.png" /> <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> + <fileset dir="." includes="hs_err_pid*.log" /> <fileset file="${jogl-test.jar}" /> </delete> </target> @@ -59,10 +63,10 @@ <!-- - Build/run tests/junit. --> - <target name="test.compile.javase"> - <!-- Perform the junit pass Java SE compile --> + + <target name="test.compile.javase.generic"> <javac destdir="${classes}" - excludes="${java.part.test.android}" + excludes="${java.part.test.android} ${java.part.test.oculusvr}" fork="yes" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" @@ -74,14 +78,34 @@ <classpath refid="junit_jogl_newt.compile.classpath"/> <src path="${src.test}" /> </javac> + </target> + <target name="test.compile.javase.oculusvr" if="oculusvr.sdk.available"> + <javac destdir="${classes}" + includes="${java.part.test.oculusvr}" + excludes="${java.part.test.android}" + fork="yes" + includeAntRuntime="false" + memoryMaximumSize="${javac.memorymax}" + encoding="UTF-8" + source="${target.sourcelevel}" + target="${target.targetlevel}" + bootclasspath="${target.rt.jar}" + debug="${javacdebug}" debuglevel="${javacdebuglevel}"> + <classpath refid="junit_jogl_newt_oculusvr.compile.classpath"/> + <src path="${src.test}" /> + </javac> + </target> + <target name="test.compile.javase" depends="test.compile.javase.generic, test.compile.javase.oculusvr"> <copy file="joglversion-test" tofile="${build.test}/manifest-test.mf" overwrite="true"> <filterset> - <filter token="VERSION" value="${jogl.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jogl.version}"/> <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> - <filter token="BASEVERSION" value="${jogl_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> + <filter token="JAR_CODEBASE_TAG" value="${jogamp.jar.codebase}"/> </filterset> </copy> @@ -96,9 +120,10 @@ </jar> </target> - <target name="test.compile.android" if="isAndroid"> + <target name="test.compile.android" if="android-jars.available"> <!-- Perform the junit pass Java Android compile --> <javac destdir="${classes}" + excludes="${java.part.test.oculusvr}" fork="yes" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" @@ -114,10 +139,11 @@ tofile="${build.test}/manifest-test-android.mf" overwrite="true"> <filterset> - <filter token="VERSION" value="${jogl.version}"/> + <filter token="VERSION" value="${jogamp.version}"/> + <filter token="BUILD_VERSION" value="${jogl.version}"/> <filter token="SCM_BRANCH" value="${jogl.build.branch}"/> <filter token="SCM_COMMIT" value="${jogl.build.commit}"/> - <filter token="BASEVERSION" value="${jogl_base_version}"/> + <filter token="BASEVERSION" value="${jogamp.version.base}"/> </filterset> </copy> @@ -129,7 +155,9 @@ includes="${java.part.test.all}"/> <fileset dir="resources/assets-test" includes="**" /> </jar> + </target> + <target name="test.package.android" depends="test.compile.android" if="isAndroid"> <aapt.signed assetsdir="resources/assets-test" jarsrcdir="${src}/test" @@ -140,8 +168,8 @@ androidmanifest.path="resources/android/AndroidManifest-test.xml" androidresources.path="resources/android/res-test" jarmanifest.path="${build.test}/manifest-test-android.mf" - version.code="${jogl_int_version}" - version.name="${jogl.version.plus}" /> + version.code="${jogamp.version.int}" + version.name="${jogamp.version}" /> </target> <target name="test.compile.check" depends="declare.common"> @@ -171,10 +199,10 @@ </fileset> </copy> <antcall target="test.compile.javase" inheritRefs="true" inheritAll="true"/> - <antcall target="test.compile.android" inheritRefs="true" inheritAll="true"/> + <antcall target="test.package.android" inheritRefs="true" inheritAll="true"/> </target> - <target name="test.manual.run" depends="test.compile"> + <target name="test.manual.run" depends="test.compile, junit.run.settings"> <for param="test.class.path.m" keepgoing="true"> <!-- results in absolute path --> <fileset dir="${classes}"> @@ -194,7 +222,7 @@ </pathconvert> <var name="test.class.result.file" value="${results.test}/TEST-${test.class.fqn}.log"/> <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/> - <apply dir="." executable="${java.home}/bin/java" + <apply dir="." executable="${jvmJava.exe}" parallel="false" timeout="${batchtest.timeout}" vmlauncher="false" @@ -223,7 +251,7 @@ <target name="junit.run.noui" depends="test.compile"> <!-- Test*NOUI* --> - <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> + <junit jvm="${jvmJava.exe}" forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> <jvmarg value="${junit.run.arg0}"/> <jvmarg value="${junit.run.arg1}"/> @@ -256,7 +284,9 @@ </junit> </target> - <target name="junit.run.newt.headless" depends="test.compile"> + <target name="generic.junit.run.newt.headless"> + <!-- attribute name="generic.junit.run.newt.headless.include.pattern" --> + <!-- Test*NEWT* Emulation of junit task, @@ -267,8 +297,10 @@ <for param="test.class.path.m" keepgoing="true"> <!-- results in absolute path --> <fileset dir="${classes}"> - <include name="${java.dir.junit}/**/Test*NEWT*"/> + <include name="${generic.junit.run.newt.headless.include.pattern}"/> <exclude name="**/*$$*"/> + <exclude name="**/*AWT*"/> + <exclude name="**/*SWT*"/> </fileset> <sequential> <var name="test.class.path" unset="true"/> @@ -283,7 +315,7 @@ </pathconvert> <var name="test.class.result.file" value="${results.test}/TEST-${test.class.fqn}.xml"/> <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/> - <apply dir="." executable="${java.home}/bin/java" + <apply dir="." executable="${jvmJava.exe}" parallel="false" timeout="${batchtest.timeout}" vmlauncher="false" @@ -296,6 +328,7 @@ <arg line="${jvmDataModel.arg}"/> <arg value="-Djava.library.path=${obj.all.paths}"/> <arg line="${jvmarg.headless}"/> + <arg line="${jvmarg.mainthrd}"/> <!-- <arg line="-Dnewt.debug.EDT"/> --> @@ -318,6 +351,13 @@ </apply> </sequential> </for> + <var name="generic.junit.run.newt.headless.include.pattern" unset="true"/> + </target> + + <target name="junit.run.newt.headless" depends="test.compile"> + <!-- Test*NEWT* --> + <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/**/Test*NEWT*"/> + <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/> </target> <!-- junit.run.newt is covered by junit.run.newt.headless, disable it for now, but may be checked manually. @@ -326,7 +366,7 @@ --> <target name="junit.run.newt" depends="test.compile"> <!-- Test*NEWT* --> - <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> + <junit jvm="${jvmJava.exe}" forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> <jvmarg value="${junit.run.arg0}"/> <jvmarg value="${junit.run.arg1}"/> @@ -354,6 +394,8 @@ <fileset dir="${classes}"> <include name="${java.dir.junit}/**/Test*NEWT*"/> <exclude name="**/*$$*"/> + <exclude name="**/*AWT*"/> + <exclude name="**/*SWT*"/> </fileset> <formatter usefile="false" type="brief"/> <formatter usefile="true" type="xml"/> @@ -361,9 +403,11 @@ </junit> </target> - <target name="junit.run.awt" depends="test.compile"> + <target name="generic.junit.run.awt"> + <!-- attribute name="generic.junit.run.awt.include.pattern" --> + <!-- Test*AWT* --> - <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> + <junit jvm="${jvmJava.exe}" forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> <jvmarg value="${junit.run.arg0}"/> <jvmarg value="${junit.run.arg1}"/> @@ -387,7 +431,7 @@ <batchtest todir="${results.test}"> <fileset dir="${classes}"> - <include name="${java.dir.junit}/**/Test*AWT*"/> + <include name="${generic.junit.run.awt.include.pattern}"/> <exclude name="**/*$$*"/> <exclude name="**/*SWT*"/> <exclude name="**/newt/**"/> @@ -396,11 +440,107 @@ <formatter usefile="true" type="xml"/> </batchtest> </junit> + <var name="generic.junit.run.awt.include.pattern" unset="true"/> + </target> + + <target name="junit.run.awt" depends="test.compile"> + <!-- Test*AWT* --> + <property name="generic.junit.run.awt.include.pattern" value="${java.dir.junit}/**/Test*AWT*"/> + <antcall target="generic.junit.run.awt" inheritRefs="true" inheritAll="true"/> + </target> + + <target name="generic.junit.run.newt.awt"> + <!-- attribute name="generic.junit.run.newt.awt.include.pattern" --> + + <!-- Test*AWT* --> + <junit jvm="${jvmJava.exe}" forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> + <env key="${system.env.library.path}" path="${obj.all.paths}"/> + <jvmarg value="${junit.run.arg0}"/> + <jvmarg value="${junit.run.arg1}"/> + <jvmarg value="${jvmDataModel.arg}"/> + <jvmarg value="-Djava.library.path=${obj.all.paths}"/> + + <!-- + <jvmarg value="-Dnewt.debug.EDT"/> + <jvmarg value="-Djogl.debug=all"/> + <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/> + <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/> + <jvmarg value="-Djogl.debug.GLSLState"/> + <jvmarg value="-Dnativewindow.debug=all"/> + <jvmarg value="-Dnewt.debug=all"/> + <jvmarg value="-verbose:jni"/> + <jvmarg value="-client"/> + <jvmarg value="-d32"/> + --> + + <formatter usefile="false" type="plain"/> + <formatter usefile="true" type="xml"/> + <classpath refid="junit_jogl_awt.run.classpath"/> + + <batchtest todir="${results.test}"> + <fileset dir="${classes}"> + <include name="${generic.junit.run.newt.awt.include.pattern}"/> + <exclude name="**/*SWT*"/> + <exclude name="**/*$$*"/> + </fileset> + <formatter usefile="false" type="brief"/> + <formatter usefile="true" type="xml"/> + </batchtest> + </junit> + <var name="generic.junit.run.newt.awt.include.pattern" unset="true"/> + </target> + + <target name="junit.run.newt.awt" depends="test.compile"> + <!-- Test*AWT* --> + <property name="generic.junit.run.newt.awt.include.pattern" value="${java.dir.junit}/**/newt/**/Test*AWT*"/> + <antcall target="generic.junit.run.newt.awt" inheritRefs="true" inheritAll="true"/> + + <!-- + <property name="generic.junit.run.newt.awt.include.pattern" value="${java.dir.junit}/**/newt/**/TestNewtEventModifiers*AWT*"/> + <antcall target="generic.junit.run.newt.awt" inheritRefs="true" inheritAll="true"/> + <property name="generic.junit.run.newt.awt.include.pattern" value="${java.dir.junit}/**/acore/glels/Test**"/> + <antcall target="generic.junit.run.newt.awt" inheritRefs="true" inheritAll="true"/> + --> + </target> + + <target name="junit.run.sharedctx" depends="test.compile, junit.run.settings"> + <!-- Test*NEWT* --> + <echo message="+++ "/> + <echo message="+++ Testing Shared NEWT"/> + <echo message="+++ "/> + <property name="generic.junit.run.newt.headless.include.pattern" value="${java.dir.junit}/**/acore/Test*Shared*NEWT*"/> + <antcall target="generic.junit.run.newt.headless" inheritRefs="true" inheritAll="true"/> + + <!-- Test*AWT* --> + <echo message="+++ "/> + <echo message="+++ Testing Shared AWT"/> + <echo message="+++ "/> + <property name="generic.junit.run.awt.include.pattern" value="${java.dir.junit}/**/acore/Test*Shared*AWT*"/> + <antcall target="generic.junit.run.awt" inheritRefs="true" inheritAll="true"/> + + <!-- Test*SWTHeadless* --> + <echo message="+++ "/> + <echo message="+++ Testing Shared SWT"/> + <echo message="+++ "/> + <property name="generic.junit.run.swt.headless.include.pattern" value="${java.dir.junit}/**/acore/Test*Shared*SWT*"/> + <antcall target="generic.junit.run.swt.headless" inheritRefs="true" inheritAll="true"/> + </target> + + <target name="junit.run.newt.event" depends="test.compile, junit.run.settings"> + <!-- Test*AWT* --> + <property name="generic.junit.run.newt.awt.include.pattern" value="${java.dir.junit}/**/newt/event/Test**"/> + <antcall target="generic.junit.run.newt.awt" inheritRefs="true" inheritAll="true"/> </target> - <target name="junit.run.awt.singletest" depends="test.compile"> + <target name="junit.run.newt.monitormode" depends="test.compile, junit.run.settings"> <!-- Test*AWT* --> - <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> + <property name="generic.junit.run.newt.awt.include.pattern" value="${java.dir.junit}/**/newt/mm/Test**"/> + <antcall target="generic.junit.run.newt.awt" inheritRefs="true" inheritAll="true"/> + </target> + + <target name="junit.run.awt.singletest" depends="test.compile, junit.run.settings"> + <!-- Test*AWT* --> + <junit jvm="${jvmJava.exe}" forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> <jvmarg value="${junit.run.arg0}"/> <jvmarg value="${junit.run.arg1}"/> @@ -426,7 +566,53 @@ </junit> </target> - <target name="junit.run.swt.headless" depends="test.compile" description="Runs all pure SWT tests." if="isSWTRuntimeAvailable"> + <target name="junit.run.newt.headless.singletest" depends="test.compile, junit.run.settings"> + <!-- Test*NEWT* + + Emulation of junit task, + due to the fact that we have to place invoke our MainThread class first (-> MacOSX). + + Utilizing Ant-1.8.0 and ant-contrib-1.0b3 (loops, mutable properties). + --> + <var name="test.class.result.file" value="${results.test}/TEST-${testclass}.xml"/> + <echo message="Testing ${testclass} -- ${test.class.result.file}"/> + <apply dir="." executable="${jvmJava.exe}" + parallel="false" + timeout="${batchtest.timeout}" + vmlauncher="false" + relative="true" + failonerror="false"> + <env key="${system.env.library.path}" path="${obj.all.paths}"/> + <env key="CLASSPATH" value="${junit_jogl_noawt.run.jars}"/> + <arg line="${junit.run.arg0}"/> + <arg line="${junit.run.arg1}"/> + <arg line="${jvmDataModel.arg}"/> + <arg value="-Djava.library.path=${obj.all.paths}"/> + <arg line="${jvmarg.headless}"/> + <arg line="${jvmarg.mainthrd}"/> + <!-- + <arg line="-Dnewt.debug.EDT"/> + --> + <arg line="com.jogamp.newt.util.MainThread"/> + <arg line="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner"/> + <!-- srcfile/ --> + <arg line="${testclass}"/> + <arg line="filtertrace=true"/> + <arg line="haltOnError=false"/> + <arg line="haltOnFailure=false"/> + <arg line="showoutput=true"/> + <arg line="outputtoformatters=true"/> + <arg line="logfailedtests=true"/> + <arg line="logtestlistenerevents=true"/> + <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter"/> + <arg line="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.class.result.file}"/> + <fileset dir="${results.test}" includes="dummy.txt"/> + </apply> + </target> + + <target name="generic.junit.run.swt.headless"> + <!-- attribute name="generic.junit.run.swt.headless.include.pattern" --> + <!-- Test*SWTHeadless* Emulation of junit task. @@ -436,7 +622,8 @@ <for param="test.class.path.m" keepgoing="true"> <!-- results in absolute path --> <fileset dir="${classes}"> - <include name="${java.dir.junit}/**/Test*SWTHeadless*"/> + <include name="@{generic.junit.run.swt.headless.include.pattern}"/> + <exclude name="**/*AWT*"/> <exclude name="**/*$$*"/> </fileset> <sequential> @@ -452,7 +639,7 @@ </pathconvert> <var name="test.class.result.file" value="${results.test}/TEST-${test.class.fqn}.xml"/> <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/> - <apply dir="." executable="${java.home}/bin/java" + <apply dir="." executable="${jvmJava.exe}" parallel="false" timeout="${batchtest.timeout}" vmlauncher="false" @@ -465,10 +652,10 @@ <arg line="${jvmDataModel.arg}"/> <arg value="-Djava.library.path=${obj.all.paths}"/> <arg line="${jvmarg.headless}"/> + <arg line="${jvmarg.mainthrd}"/> <!-- <arg line="-Dnewt.debug.EDT"/> --> - <!-- arg line="com.jogamp.newt.util.MainThread"/--> <arg line="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner"/> <srcfile/> <arg line="filtertrace=true"/> @@ -487,6 +674,13 @@ </apply> </sequential> </for> + <var name="generic.junit.run.swt.headless.include.pattern" unset="true"/> + </target> + + <target name="junit.run.swt.headless" depends="test.compile" description="Runs all pure SWT tests." if="isSWTRuntimeAvailable"> + <!-- Test*SWTHeadless* --> + <property name="generic.junit.run.swt.headless.include.pattern" value="${java.dir.junit}/**/Test*SWT*"/> + <antcall target="generic.junit.run.swt.headless" inheritRefs="true" inheritAll="true"/> </target> <target name="junit.run.swt.awt" depends="test.compile" description="Runs all pure SWT AWT tests." if="isSWTRuntimeAvailable"> @@ -499,9 +693,8 @@ <for param="test.class.path.m" keepgoing="true"> <!-- results in absolute path --> <fileset dir="${classes}"> - <include name="${java.dir.junit}/**/Test*SWT*"/> + <include name="${java.dir.junit}/**/Test*SWT*AWT*"/> <exclude name="**/*$$*"/> - <exclude name="**/Test*SWTHeadless*"/> </fileset> <sequential> <var name="test.class.path" unset="true"/> @@ -516,7 +709,7 @@ </pathconvert> <var name="test.class.result.file" value="${results.test}/TEST-${test.class.fqn}.xml"/> <echo message="Testing ${test.class.fqn} -- ${test.class.result.file}"/> - <apply dir="." executable="${java.home}/bin/java" + <apply dir="." executable="${jvmJava.exe}" parallel="false" timeout="${batchtest.timeout}" vmlauncher="false" @@ -528,14 +721,12 @@ <arg line="${junit.run.arg1}"/> <arg line="${jvmDataModel.arg}"/> <arg value="-Djava.library.path=${obj.all.paths}"/> - <arg line="${jvmarg.mainthrd}"/> <!-- <arg line="-Dnewt.debug.EDT"/> <arg line="-Dnativewindow.debug=all"/> <arg line="-Djogl.debug=all"/> <arg line="-Dnewt.debug=all"/> --> - <!-- arg line="com.jogamp.newt.util.MainThread"/--> <arg line="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner"/> <srcfile/> <arg line="filtertrace=true"/> @@ -556,43 +747,6 @@ </for> </target> - <target name="junit.run.newt.awt" depends="test.compile"> - <!-- Test*AWT* --> - <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> - <jvmarg value="${junit.run.arg0}"/> - <jvmarg value="${junit.run.arg1}"/> - <jvmarg value="${jvmDataModel.arg}"/> - <env key="${system.env.library.path}" path="${obj.all.paths}"/> - <jvmarg value="-Djava.library.path=${obj.all.paths}"/> - - <!-- - <jvmarg value="-Dnewt.debug.EDT"/> - <jvmarg value="-Djogl.debug=all"/> - <jvmarg value="-Dgluegen.debug.NativeLibrary=true"/> - <jvmarg value="-Dgluegen.debug.ProcAddressHelper=true"/> - <jvmarg value="-Djogl.debug.GLSLState"/> - <jvmarg value="-Dnativewindow.debug=all"/> - <jvmarg value="-Dnewt.debug=all"/> - <jvmarg value="-verbose:jni"/> - <jvmarg value="-client"/> - <jvmarg value="-d32"/> - --> - - <formatter usefile="false" type="plain"/> - <formatter usefile="true" type="xml"/> - <classpath refid="junit_jogl_awt.run.classpath"/> - - <batchtest todir="${results.test}"> - <fileset dir="${classes}"> - <include name="${java.dir.junit}/**/newt/**/Test*AWT*"/> - <exclude name="**/*$$*"/> - </fileset> - <formatter usefile="false" type="brief"/> - <formatter usefile="true" type="xml"/> - </batchtest> - </junit> - </target> - <target name="junit.run.local" unless="isCrosscompilation" > <antcall target="junit.run.noui" inheritRefs="true" inheritAll="true"/> <antcall target="junit.run.newt.headless" inheritRefs="true" inheritAll="true"/> @@ -602,7 +756,7 @@ <antcall target="junit.run.swt.awt" inheritRefs="true" inheritAll="true"/> </target> - <target name="junit.run.local.d32" if="isOSX"> + <target name="junit.run.local.osx.d32" if="isOSX"> <var name="jvmDataModel.arg" unset="true"/> <var name="jvmDataModel.arg" value="-d32"/> <var name="junit_extra_classpath" unset="true"/> @@ -612,9 +766,12 @@ <mkdir dir="${build}/test/results-x32"/> <move todir="${build}/test/results-x32"> + <fileset dir="." includes="*.ps" /> + <fileset dir="." includes="*.pdf" /> <fileset dir="." includes="*.png" /> <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> + <fileset dir="." includes="hs_err_pid*.log" /> </move> <move todir="${build}/test/results-x32"> <fileset dir="${results.test}" includes="**" /> @@ -627,6 +784,32 @@ <var name="junit_extra_classpath" value=""/> </target> + <target name="junit.run.local.java7" if="jvmJava7.exe"> + <var name="jvmJavaOrig.exe" value="${jvmJava.exe}"/> + <var name="jvmJava.exe" unset="true"/> + <var name="jvmJava.exe" value="${jvmJava7.exe}"/> + + <antcall target="junit.run.local" inheritRefs="true" inheritAll="true"/> + + <mkdir dir="${build}/test/results-java7"/> + <move todir="${build}/test/results-java7"> + <fileset dir="." includes="*.ps" /> + <fileset dir="." includes="*.pdf" /> + <fileset dir="." includes="*.png" /> + <fileset dir="." includes="*.pam" /> + <fileset dir="." includes="*.tga" /> + <fileset dir="." includes="hs_err_pid*.log" /> + </move> + <move todir="${build}/test/results-java7"> + <fileset dir="${results.test}" includes="**" /> + </move> + <mkdir dir="${results.test}"/> + + <var name="jvmJava.exe" unset="true"/> + <var name="jvmJava.exe" value="${jvmJavaOrig.exe}"/> + <var name="jvmJavaOrig.exe" unset="true"/> + </target> + <target name="junit.run.remote.ssh.all" if="isCrosscompilation" unless="isAndroid"> <echo message="#! /bin/sh${line.separator}" append="false" file="${build.test}/targetcommand.sh" /> <echo message="${line.separator} @@ -938,18 +1121,23 @@ ${line.separator} </exec> </target> - <target name="junit.run.tests" depends="junit.run.local.d32, junit.run.local, junit.run.remote.ssh.all, junit.run.remote.adb"/> + <!-- target name="junit.run.tests" depends="junit.run.local.osx.d32, junit.run.local, junit.run.remote.ssh.all, junit.run.remote.adb"/--> + <target name="junit.run.tests" depends="junit.run.local, junit.run.local.java7, junit.run.remote.ssh.all, junit.run.remote.adb"/> <target name="junit.run.settings" depends="declare.common"> <delete quiet="true"> <fileset dir="${results.test}" includes="**"/> <fileset dir="${build}/test/results-x32" includes="**"/> <fileset file="${build}/${test.archive.name}.7z"/> + <fileset dir="." includes="*.ps" /> + <fileset dir="." includes="*.pdf" /> <fileset dir="." includes="*.png" /> <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> + <fileset dir="." includes="hs_err_pid*.log" /> </delete> <mkdir dir="${results.test}" /> + <touch file="${results.test}/dummy.txt"/> </target> <target name="junit.run.if.enabled" unless="junit.is.disabled"> @@ -962,9 +1150,12 @@ ${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="*.ps" /> + <fileset dir="." includes="*.pdf" /> <fileset dir="." includes="*.png" /> <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> + <fileset dir="." includes="hs_err_pid*.log" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> </target> @@ -972,9 +1163,12 @@ ${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="*.ps" /> + <fileset dir="." includes="*.pdf" /> <fileset dir="." includes="*.png" /> <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> + <fileset dir="." includes="hs_err_pid*.log" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> </target> @@ -982,9 +1176,12 @@ ${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="*.ps" /> + <fileset dir="." includes="*.pdf" /> <fileset dir="." includes="*.png" /> <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> + <fileset dir="." includes="hs_err_pid*.log" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> </target> @@ -992,9 +1189,12 @@ ${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="*.ps" /> + <fileset dir="." includes="*.pdf" /> <fileset dir="." includes="*.png" /> <fileset dir="." includes="*.pam" /> <fileset dir="." includes="*.tga" /> + <fileset dir="." includes="hs_err_pid*.log" /> </move> <antcall target="test-zip-archive" inheritRefs="true" inheritAll="true"/> </target> |