Changeset 6686
- Timestamp:
- 07/09/10 14:22:11 (9 years ago)
- Location:
- trunk
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/ant/java.xml
r6583 r6686 31 31 </target> 32 32 33 <target name="compile-tests" depends="compile, copy-test-source" description="compile test classes" if="doTests"> 33 <target name="compile-tests" depends="compile, copy-test-source" 34 description="compile test classes" if="doTests"> 34 35 <javac debug="true" deprecation="${component.deprecation}" 35 36 source="${component.java-version}" … … 45 46 </target> 46 47 47 <target name="test" depends="jar, compile-tests" description="run tests" if="doTests"> 48 <testng classpath="${test-classes.dir}:${classes.dir}:${component.classpath}" 49 groups="all" testname="${component.name}"> 50 <xmlfileset file="${testng.xml}"/> 51 <jvmarg value="-mx${testng.memory}"/> 52 </testng> 48 <target name="test" depends="jar, compile-tests" 49 description="run tests" if="doTests"> 50 <!-- run JUnit tests --> 51 <if> 52 <equals arg1="${component.junit}" arg2="true"/> 53 <then> 54 <junit haltonfailure="true"> 55 <classpath> 56 <pathelement location="${artifact.dir}/junit-4.8.2.jar"/> 57 <pathelement location="${test-classes.dir}"/> 58 <pathelement location="${classes.dir}"/> 59 <pathelement path="${component.runtime-cp}"/> 60 </classpath> 61 <formatter type="brief" usefile="false"/> 62 <batchtest> 63 <fileset dir="${test-classes.dir}"> 64 <include name="**/*Test.class"/> 65 </fileset> 66 </batchtest> 67 </junit> 68 </then> 69 </if> 70 <!-- run TestNG tests --> 71 <if> 72 <isset property="testng.xml"/> 73 <then> 74 <testng haltonfailure="true" groups="all" testname="${component.name}"> 75 <classpath> 76 <pathelement path="${component.classpath}"/> 77 <pathelement location="${test-classes.dir}"/> 78 <pathelement location="${classes.dir}"/> 79 </classpath> 80 <xmlfileset file="${testng.xml}"/> 81 <jvmarg value="-mx${testng.memory}"/> 82 </testng> 83 </then> 84 </if> 53 85 </target> 54 86 -
trunk/ant/toplevel.xml
r6234 r6686 444 444 445 445 <target name="utils-formats" depends="jar-formats" 446 description="compile extra utilities for LOCI Plugins for ImageJ">446 description="compile extra utilities for Bio-Formats"> 447 447 <ant dir="components/bio-formats" target="formats.utils"/> 448 448 </target> -
trunk/components/bio-formats/build.xml
r6072 r6686 13 13 <property file="build.properties"/> 14 14 15 <target name="test" 16 depends="jar,compile-tests,test-no-mdb,test-no-netcdf,test-no-ome-xml,17 test-no-poi,test-no-jai,test-no-lurawave"18 description="run tests" if="doTests">15 <target name="test" depends="jar,compile-tests,test-no-mdb,test-no-netcdf, 16 test-no-ome-xml, test-no-poi,test-no-jai,test-no-lurawave" 17 description="run tests"> 18 <!-- NOTE: Overrides default "test" target from java.xml --> 19 19 <copy tofile="${build.dir}/testng.xml" overwrite="true" 20 20 file="${tests.dir}/loci/formats/utests/testng.xml"/> 21 <testng classpath="${test-classes.dir}:${classes.dir}:${component.classpath}" 22 groups="all" testname="${component.name}"> 21 <testng haltonfailure="true" groups="all" testname="${component.name}"> 22 <classpath> 23 <pathelement location="${test-classes.dir}"/> 24 <pathelement location="${classes.dir}"/> 25 <pathelement path="${component.classpath}"/> 26 </classpath> 23 27 <xmlfileset file="${build.dir}/testng.xml"/> 24 28 <jvmarg value="-mx${testng.memory}"/> … … 31 35 <copy tofile="${build.dir}/testng.xml" overwrite="true" 32 36 file="${tests.dir}/loci/formats/utests/testng-no-mdb.xml"/> 33 <testng classpath= 34 "${test-classes.dir}:${classes.dir}:${component.cp.no-mdb}"> 35 <!--<testng classpath="${test-classes.dir}:${classes.dir}:${artifact.dir}/loci-common.jar">--> 37 <testng> 38 <classpath> 39 <pathelement location="${test-classes.dir}"/> 40 <pathelement location="${classes.dir}"/> 41 <pathelement path="${component.cp.no-mdb}"/> 42 </classpath> 36 43 <xmlfileset file="${build.dir}/testng.xml"/> 37 44 <jvmarg value="-mx${testng.memory}"/> … … 43 50 <copy tofile="${build.dir}/testng.xml" overwrite="true" 44 51 file="${tests.dir}/loci/formats/utests/testng-no-netcdf.xml"/> 45 <testng classpath= 46 "${test-classes.dir}:${classes.dir}:${component.cp.no-netcdf}"> 52 <testng> 53 <classpath> 54 <pathelement location="${test-classes.dir}"/> 55 <pathelement location="${classes.dir}"/> 56 <pathelement path="${component.cp.no-netcdf}"/> 57 </classpath> 47 58 <xmlfileset file="${build.dir}/testng.xml"/> 48 59 <jvmarg value="-mx${testng.memory}"/> … … 54 65 <copy tofile="${build.dir}/testng.xml" overwrite="true" 55 66 file="${tests.dir}/loci/formats/utests/testng-no-ome-xml.xml"/> 56 <testng classpath= 57 "${test-classes.dir}:${classes.dir}:${component.cp.no-xml}"> 67 <testng> 68 <classpath> 69 <pathelement location="${test-classes.dir}"/> 70 <pathelement location="${classes.dir}"/> 71 <pathelement path="${component.cp.no-xml}"/> 72 </classpath> 58 73 <xmlfileset file="${build.dir}/testng.xml"/> 59 74 <jvmarg value="-mx${testng.memory}"/> … … 65 80 <copy tofile="${build.dir}/testng.xml" overwrite="true" 66 81 file="${tests.dir}/loci/formats/utests/testng-no-poi.xml"/> 67 <testng classpath= 68 "${test-classes.dir}:${classes.dir}:${component.cp.no-poi}"> 82 <testng> 83 <classpath> 84 <pathelement location="${test-classes.dir}"/> 85 <pathelement location="${classes.dir}"/> 86 <pathelement path="${component.cp.no-poi}"/> 87 </classpath> 69 88 <xmlfileset file="${build.dir}/testng.xml"/> 70 89 <jvmarg value="-mx${testng.memory}"/> … … 76 95 <copy tofile="${build.dir}/testng.xml" overwrite="true" 77 96 file="${tests.dir}/loci/formats/utests/testng-no-jai.xml"/> 78 <testng classpath= 79 "${test-classes.dir}:${classes.dir}:${component.cp.no-jai}"> 97 <testng> 98 <classpath> 99 <pathelement location="${test-classes.dir}"/> 100 <pathelement location="${classes.dir}"/> 101 <pathelement path="${component.cp.no-jai}"/> 102 </classpath> 80 103 <xmlfileset file="${build.dir}/testng.xml"/> 81 104 <jvmarg value="-mx${testng.memory}"/> … … 87 110 <copy tofile="${build.dir}/testng.xml" overwrite="true" 88 111 file="${tests.dir}/loci/formats/utests/testng-no-lurawave.xml"/> 89 <testng classpath= 90 "${test-classes.dir}:${classes.dir}:${component.cp.no-lurawave}"> 112 <testng> 113 <classpath> 114 <pathelement location="${test-classes.dir}"/> 115 <pathelement location="${classes.dir}"/> 116 <pathelement path="${component.cp.no-lurawave}"/> 117 </classpath> 91 118 <xmlfileset file="${build.dir}/testng.xml"/> 92 119 <jvmarg value="-mx${testng.memory}"/> … … 96 123 <target name="test-metadata" depends="compile-tests" 97 124 description="test metadata level support for a single file" if="doTests"> 98 <testng sourcedir="${test.dir}" 99 classpath="${test-classes.dir}:${classes.dir}:${component.classpath}" 100 testname="Metadata tests"> 125 <testng sourcedir="${test.dir}" testname="Metadata tests"> 126 <classpath> 127 <pathelement location="${test-classes.dir}"/> 128 <pathelement location="${classes.dir}"/> 129 <pathelement path="${component.classpath}"/> 130 </classpath> 101 131 <classfileset file="${test-classes.dir}/loci/formats/utests/MetadataConfigurableTest.class"/> 102 132 <sysproperty key="testng.filename" value="${testng.filename}"/> -
trunk/components/common/build.xml
r6093 r6686 13 13 <property file="build.properties"/> 14 14 15 <target name="test" depends="jar, compile-tests" 16 description="run tests" if="doTests"> 15 <target name="test" depends="jar, compile-tests" description="run tests"> 17 16 <!-- NOTE: Overrides default "test" target from java.xml --> 18 17 <copy tofile="${build.dir}/testng.xml" 19 18 file="${testng.xml.template}" overwrite="true"> 20 19 <filterset> 21 <filter token="PARALLEL" value=""/> 20 <filter token="PARALLEL" value=""/> <!-- Disable parallelization --> 22 21 </filterset> 23 22 </copy> 24 <testng 25 classpath="${test-classes.dir}:${classes.dir}:${component.runtime-cp}"> 23 <testng> 24 <classpath> 25 <pathelement location="${test-classes.dir}"/> 26 <pathelement location="${classes.dir}"/> 27 <pathelement path="${component.runtime-cp}"/> 28 </classpath> 26 29 <xmlfileset file="${build.dir}/testng.xml"/> 27 30 <jvmarg value="-mx${testng.memory}"/> … … 37 40 </filterset> 38 41 </copy> 39 <testng 40 classpath="${test-classes.dir}:${classes.dir}:${component.runtime-cp}"> 42 <testng> 43 <classpath> 44 <pathelement location="${test-classes.dir}"/> 45 <pathelement location="${classes.dir}"/> 46 <pathelement path="${component.runtime-cp}"/> 47 </classpath> 41 48 <xmlfileset file="${build.dir}/testng.xml"/> 42 49 <jvmarg value="-mx${testng.memory}"/> -
trunk/components/loci-plugins/build.properties
r6684 r6686 27 27 component.main-class = loci.plugins.About 28 28 component.runtime-cp = ${component.classpath} 29 30 component.junit = true -
trunk/components/loci-plugins/build.xml
r6506 r6686 12 12 <import file="${root.dir}/ant/java.xml"/> 13 13 <property file="build.properties"/> 14 15 <target name="test" depends="jar, compile-tests"16 description="run tests" if="doTests">17 <!-- overrides default 'test' target in java.xml -->18 19 <junit>20 <classpath>21 <pathelement path="${component.classpath}"/>22 <pathelement location="${test-classes.dir}"/>23 </classpath>24 <formatter type="plain" usefile="true"/>25 <test name="loci.plugins.in.ImporterTest"/>26 </junit>27 </target>28 14 </project> -
trunk/components/ome-io/build.xml
r6026 r6686 13 13 <property file="build.properties"/> 14 14 15 <target name="test" depends="jar,test-no-omeio" description="run tests" if="doTests"> 15 <target name="test" depends="jar, test-no-omeio" description="run tests"> 16 <!-- NOTE: Overrides default "test" target from java.xml --> 16 17 <copy tofile="${build.dir}/testng.xml" overwrite="true" 17 18 file="${tests.dir}/loci/ome/utests/testng.xml"/> 18 <testng 19 classpath="${test-classes.dir}:${classes.dir}:${component.classpath}"> 19 <testng> 20 <classpath> 21 <pathelement location="${test-classes.dir}"/> 22 <pathelement location="${classes.dir}"/> 23 <pathelement path="${component.classpath}"/> 24 </classpath> 20 25 <xmlfileset file="${build.dir}/testng.xml"/> 21 26 <jvmarg value="-mx${testng.memory}"/> … … 26 31 <copy tofile="${build.dir}/testng.xml" overwrite="true" 27 32 file="${tests.dir}/loci/ome/utests/testng-no-ome-io.xml"/> 28 <testng classpath="${test-classes.dir}:${component.classpath}"> 33 <testng> 34 <classpath> 35 <pathelement location="${test-classes.dir}"/> 36 <pathelement path="${component.classpath}"/> 37 </classpath> 29 38 <xmlfileset file="${build.dir}/testng.xml"/> 30 39 <jvmarg value="-mx${testng.memory}"/> -
trunk/components/test-suite/build.xml
r6016 r6686 13 13 <property file="build.properties"/> 14 14 15 <taskdef name="testng" classpath="${component.classpath}"16 classname="org.testng.TestNGAntTask"/>17 18 15 <target name="test-convert" depends="compile" 19 16 description="run automated tests on writers"> 20 17 <testng sourcedir="${dest.dir}" 21 classpath="${classes.dir}:${component.classpath}"22 18 annotations="Javadoc" groups="all" testname="Writer tests" 23 19 listener="loci.tests.testng.DotTestListener" 24 20 suitename="LOCI software test suite"> 21 <classpath> 22 <pathelement location="${classes.dir}"/> 23 <pathelement path="${component.classpath}"/> 24 </classpath> 25 25 <classfileset file="${classes.dir}/${writer-test.class}"/> 26 26 <sysproperty key="testng.filename" value="${testng.filename}"/> … … 34 34 description="run all automated tests"> 35 35 <testng sourcedir="${dest.dir}" 36 classpath="${classes.dir}:${component.classpath}"37 36 annotations="Javadoc" groups="all" testname="All tests" 38 37 listener="loci.tests.testng.DotTestListener" 39 38 suitename="LOCI software test suite"> 39 <classpath> 40 <pathelement location="${classes.dir}"/> 41 <pathelement path="${component.classpath}"/> 42 </classpath> 40 43 <classfileset file="${classes.dir}/${reader-test.class}"/> 41 44 <sysproperty key="testng.filename" value="${testng.filename}"/> … … 50 53 description="generate config files for automated test suite"> 51 54 <testng sourcedir="${dest.dir}" 52 classpath="${classes.dir}:${component.classpath}"53 55 annotations="Javadoc" groups="config" testname="Config generation" 54 56 listener="loci.tests.testng.DotTestListener" 55 57 suitename="LOCI software test suite"> 58 <classpath> 59 <pathelement location="${classes.dir}"/> 60 <pathelement path="${component.classpath}"/> 61 </classpath> 56 62 <classfileset file="${classes.dir}/${reader-test.class}"/> 57 63 <sysproperty key="testng.filename" value="${testng.filename}"/> … … 66 72 description="run automated tests in group 'fast'"> 67 73 <testng sourcedir="${dest.dir}" 68 classpath="${classes.dir}:${component.classpath}"69 74 annotations="Javadoc" groups="fast" testname="Fast tests" 70 75 listener="loci.tests.testng.DotTestListener" 71 76 suitename="LOCI software test suite"> 77 <classpath> 78 <pathelement location="${classes.dir}"/> 79 <pathelement path="${component.classpath}"/> 80 </classpath> 72 81 <classfileset file="${classes.dir}/${reader-test.class}"/> 73 82 <sysproperty key="testng.filename" value="${testng.filename}"/> … … 82 91 description="run automated tests in group 'pixels'"> 83 92 <testng sourcedir="${dest.dir}" 84 classpath="${classes.dir}:${component.classpath}"85 93 annotations="Javadoc" groups="pixels" testname="Pixels tests" 86 94 listener="loci.tests.testng.DotTestListener" 87 95 suitename="LOCI software test suite"> 96 <classpath> 97 <pathelement location="${classes.dir}"/> 98 <pathelement path="${component.classpath}"/> 99 </classpath> 88 100 <classfileset file="${classes.dir}/${reader-test.class}"/> 89 101 <sysproperty key="testng.filename" value="${testng.filename}"/> … … 98 110 description="run automated tests in group 'xml'"> 99 111 <testng sourcedir="${dest.dir}" 100 classpath="${classes.dir}:${component.classpath}"101 112 annotations="Javadoc" groups="xml" testname="XML tests" 102 113 listener="loci.tests.testng.DotTestListener" 103 114 suitename="LOCI software test suite"> 115 <classpath> 116 <pathelement location="${classes.dir}"/> 117 <pathelement path="${component.classpath}"/> 118 </classpath> 104 119 <classfileset file="${classes.dir}/${reader-test.class}"/> 105 120 <sysproperty key="testng.filename" value="${testng.filename}"/> -
trunk/components/visbio/build.properties
r6521 r6686 31 31 component.main-class = loci.visbio.VisBio 32 32 component.runtime-cp = ${component.classpath} 33 34 component.junit = true 33 35 34 36 # Properties for dist targets
Note: See TracChangeset
for help on using the changeset viewer.