Ignore:
Timestamp:
07/09/10 14:22:11 (9 years ago)
Author:
curtis
Message:

Fix up test targets in Ant build scripts.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/build.xml

    r6072 r6686  
    1313  <property file="build.properties"/> 
    1414 
    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 --> 
    1919    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    2020      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> 
    2327      <xmlfileset file="${build.dir}/testng.xml"/> 
    2428      <jvmarg value="-mx${testng.memory}"/> 
     
    3135    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    3236      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> 
    3643      <xmlfileset file="${build.dir}/testng.xml"/> 
    3744      <jvmarg value="-mx${testng.memory}"/> 
     
    4350    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    4451      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> 
    4758      <xmlfileset file="${build.dir}/testng.xml"/> 
    4859      <jvmarg value="-mx${testng.memory}"/> 
     
    5465    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    5566      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> 
    5873      <xmlfileset file="${build.dir}/testng.xml"/> 
    5974      <jvmarg value="-mx${testng.memory}"/> 
     
    6580    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    6681      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> 
    6988      <xmlfileset file="${build.dir}/testng.xml"/> 
    7089      <jvmarg value="-mx${testng.memory}"/> 
     
    7695    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    7796      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> 
    80103      <xmlfileset file="${build.dir}/testng.xml"/> 
    81104      <jvmarg value="-mx${testng.memory}"/> 
     
    87110    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    88111      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> 
    91118      <xmlfileset file="${build.dir}/testng.xml"/> 
    92119      <jvmarg value="-mx${testng.memory}"/> 
     
    96123  <target name="test-metadata" depends="compile-tests" 
    97124    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> 
    101131      <classfileset file="${test-classes.dir}/loci/formats/utests/MetadataConfigurableTest.class"/> 
    102132      <sysproperty key="testng.filename" value="${testng.filename}"/> 
Note: See TracChangeset for help on using the changeset viewer.