diff options
Diffstat (limited to 'make')
| -rw-r--r-- | make/build-common.xml | 8 | ||||
| -rw-r--r-- | make/build-test.xml | 28 |
2 files changed, 18 insertions, 18 deletions
diff --git a/make/build-common.xml b/make/build-common.xml index cc34f0093..91f423e86 100644 --- a/make/build-common.xml +++ b/make/build-common.xml @@ -134,15 +134,15 @@ <property name="build.newt" value="${build}/newt" /> <property name="obj.newt" value="${build.newt}/obj"/> - <property name="results.junit" value="${build}/test/results" /> - <property name="build.junit" value="${build}/test/build" /> - <property name="obj.junit" value="${build.junit}/obj"/> + <property name="results.test" value="${build}/test/results" /> + <property name="build.test" value="${build}/test/build" /> + <property name="obj.test" value="${build.test}/obj"/> <condition property="obj.custom" value="${custom.libdir}${path.separator}" else=""> <isset property="custom.libdir"/> </condition> - <property name="obj.all.paths" value="${obj.custom}${obj.gluegen}${path.separator}${obj.nativewindow}${path.separator}${obj.jogl}${path.separator}${obj.newt}${path.separator}${obj.junit}" /> + <property name="obj.all.paths" value="${obj.custom}${obj.gluegen}${path.separator}${obj.nativewindow}${path.separator}${obj.jogl}${path.separator}${obj.newt}${path.separator}${obj.test}" /> <path id="gluegen.classpath"> <pathelement location="${gluegen.jar}" /> diff --git a/make/build-test.xml b/make/build-test.xml index 29040e867..d3ba5bec7 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -15,10 +15,10 @@ - Declare all paths and user defined variables. --> <target name="declare.common" description="Declare properties" depends="common.init"> - <property name="rootrel.src.junit" value="src/test" /> - <property name="src.junit" value="${project.root}/${rootrel.src.junit}" /> + <property name="rootrel.src.test" value="src/test" /> + <property name="src.test" value="${project.root}/${rootrel.src.test}" /> - <property name="classes" value="${build.junit}/classes" /> + <property name="classes" value="${build.test}/classes" /> <property name="classes.path" location="${classes}"/> <!-- absolute path --> <property name="java.dir.test" value="com/jogamp/opengl/test"/> @@ -36,7 +36,7 @@ --> <target name="init" depends="declare.common"> <!-- Create the required output directories. --> - <mkdir dir="${obj.junit}" /> + <mkdir dir="${obj.test}" /> <mkdir dir="${classes}" /> </target> @@ -46,7 +46,7 @@ --> <target name="clean" description="Remove all build products" depends="declare.common"> <delete includeEmptyDirs="true" quiet="true"> - <fileset dir="${build.junit}" /> + <fileset dir="${build.test}" /> </delete> </target> @@ -59,7 +59,7 @@ <echo message="jogl.test.jar ${jogl.test.jar.path}"/> <uptodate property="test.compile.skip"> <srcfiles dir= "." includes="*.xml"/> - <srcfiles dir= "${src.junit}" includes="**"/> + <srcfiles dir= "${src.test}" includes="**"/> <srcfiles file="${nativewindow.all.jar}" /> <srcfiles file="${jogl.all.jar}" /> <srcfiles file="${newt.all.jar}" /> @@ -77,7 +77,7 @@ includeAntRuntime="false" debug="${javacdebug}" debuglevel="${javacdebuglevel}"> <classpath refid="junit_jogl_newt.compile.classpath"/> - <src path="${src.junit}" /> + <src path="${src.test}" /> </javac> <delete includeEmptyDirs="true" quiet="true"> <fileset file="${jogl.test.jar}" /> @@ -90,9 +90,9 @@ </target> <target name="test.run.setup" depends="test.compile"> - <mkdir dir="${results.junit}" /> + <mkdir dir="${results.test}" /> <delete quiet="true"> - <fileset dir="${results.junit}" includes="**"/> + <fileset dir="${results.test}" includes="**"/> </delete> <condition property="jvmarg.newt.headless" value="-XstartOnFirstThread -Djava.awt.headless=true"><isset property="isOSX"/></condition> @@ -117,7 +117,7 @@ <packagemapper from="*.class" to="*"/> <!-- FQCN --> </chainedmapper> </pathconvert> - <var name="test.class.result.file" value="${results.junit}/TEST-${test.class.fqn}.log"/> + <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" parallel="false" @@ -167,7 +167,7 @@ <packagemapper from="*.class" to="*"/> <!-- FQCN --> </chainedmapper> </pathconvert> - <var name="test.class.result.file" value="${results.junit}/TEST-${test.class.fqn}.xml"/> + <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" parallel="false" @@ -231,7 +231,7 @@ <formatter usefile="true" type="xml"/> <classpath refid="junit_jogl_newt.run.classpath"/> - <batchtest todir="${results.junit}"> + <batchtest todir="${results.test}"> <fileset dir="${classes}"> <include name="${java.dir.junit}/**/Test*NEWT*"/> <exclude name="**/*$$*"/> @@ -265,7 +265,7 @@ <formatter usefile="true" type="xml"/> <classpath refid="junit_jogl_awt.run.classpath"/> - <batchtest todir="${results.junit}"> + <batchtest todir="${results.test}"> <fileset dir="${classes}"> <include name="${java.dir.junit}/**/Test*AWT*"/> <exclude name="**/*$$*"/> @@ -301,7 +301,7 @@ <formatter usefile="true" type="xml"/> <classpath refid="junit_jogl_newt_awt.run.classpath"/> - <batchtest todir="${results.junit}"> + <batchtest todir="${results.test}"> <fileset dir="${classes}"> <include name="${java.dir.junit}/**/newt/**/Test*AWT*"/> <exclude name="**/*$$*"/> |