Changeset 6745


Ignore:
Timestamp:
07/28/10 13:08:59 (9 years ago)
Author:
melissa
Message:

Updated overridden test targets to make Ant fail if any of the tests failed. Closes #521.

Location:
trunk/components
Files:
4 edited

Legend:

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

    r6686 r6745  
    3535    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    3636      file="${tests.dir}/loci/formats/utests/testng-no-mdb.xml"/> 
    37     <testng> 
     37    <testng failureProperty="failedTest"> 
    3838      <classpath> 
    3939        <pathelement location="${test-classes.dir}"/> 
     
    4444      <jvmarg value="-mx${testng.memory}"/> 
    4545    </testng> 
     46    <fail if="failedTest"/> 
    4647  </target> 
    4748 
     
    5051    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    5152      file="${tests.dir}/loci/formats/utests/testng-no-netcdf.xml"/> 
    52     <testng> 
     53    <testng failureProperty="failedTest"> 
    5354      <classpath> 
    5455        <pathelement location="${test-classes.dir}"/> 
     
    5960      <jvmarg value="-mx${testng.memory}"/> 
    6061    </testng> 
     62    <fail if="failedTest"/> 
    6163  </target> 
    6264 
     
    6567    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    6668      file="${tests.dir}/loci/formats/utests/testng-no-ome-xml.xml"/> 
    67     <testng> 
     69    <testng failureProperty="failedTest"> 
    6870      <classpath> 
    6971        <pathelement location="${test-classes.dir}"/> 
     
    7476      <jvmarg value="-mx${testng.memory}"/> 
    7577    </testng> 
     78    <fail if="failedTest"/> 
    7679  </target> 
    7780 
     
    8083    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    8184      file="${tests.dir}/loci/formats/utests/testng-no-poi.xml"/> 
    82     <testng> 
     85    <testng failureProperty="failedTest"> 
    8386      <classpath> 
    8487        <pathelement location="${test-classes.dir}"/> 
     
    8992      <jvmarg value="-mx${testng.memory}"/> 
    9093    </testng> 
     94    <fail if="failedTest"/> 
    9195  </target> 
    9296 
     
    9599    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    96100      file="${tests.dir}/loci/formats/utests/testng-no-jai.xml"/> 
    97     <testng> 
     101    <testng failureProperty="failedTest"> 
    98102      <classpath> 
    99103        <pathelement location="${test-classes.dir}"/> 
     
    104108      <jvmarg value="-mx${testng.memory}"/> 
    105109    </testng> 
     110    <fail if="failedTest"/> 
    106111  </target> 
    107112 
     
    110115    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    111116      file="${tests.dir}/loci/formats/utests/testng-no-lurawave.xml"/> 
    112     <testng> 
     117    <testng failureProperty="failedTest"> 
    113118      <classpath> 
    114119        <pathelement location="${test-classes.dir}"/> 
     
    119124      <jvmarg value="-mx${testng.memory}"/> 
    120125    </testng> 
     126    <fail if="failedTest"/> 
    121127  </target> 
    122128 
    123129  <target name="test-metadata" depends="compile-tests" 
    124130    description="test metadata level support for a single file" if="doTests"> 
    125     <testng sourcedir="${test.dir}" testname="Metadata tests"> 
     131    <testng sourcedir="${test.dir}" testname="Metadata tests" failureProperty="failedTest"> 
    126132      <classpath> 
    127133        <pathelement location="${test-classes.dir}"/> 
     
    133139      <jvmarg value="-mx${testng.memory}"/> 
    134140    </testng> 
     141    <fail if="failedTest"/> 
    135142  </target> 
    136143 
  • trunk/components/common/build.xml

    r6686 r6745  
    2121      </filterset> 
    2222    </copy> 
    23     <testng> 
     23    <testng failureProperty="failedTest"> 
    2424      <classpath> 
    2525        <pathelement location="${test-classes.dir}"/> 
     
    3030      <jvmarg value="-mx${testng.memory}"/> 
    3131    </testng> 
     32    <fail if="failedTest"/> 
    3233  </target> 
    3334 
     
    4041      </filterset> 
    4142    </copy> 
    42     <testng> 
     43    <testng failureProperty="failedTest"> 
    4344      <classpath> 
    4445        <pathelement location="${test-classes.dir}"/> 
     
    4950      <jvmarg value="-mx${testng.memory}"/> 
    5051    </testng> 
     52    <fail if="failedTest"/> 
    5153  </target> 
    5254 
  • trunk/components/ome-io/build.xml

    r6686 r6745  
    1717    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    1818      file="${tests.dir}/loci/ome/utests/testng.xml"/> 
    19     <testng> 
     19    <testng failureProperty="failedTest"> 
    2020      <classpath> 
    2121        <pathelement location="${test-classes.dir}"/> 
     
    2626      <jvmarg value="-mx${testng.memory}"/> 
    2727    </testng> 
     28    <fail if="failedTest"/> 
    2829  </target> 
    2930 
     
    3132    <copy tofile="${build.dir}/testng.xml" overwrite="true" 
    3233      file="${tests.dir}/loci/ome/utests/testng-no-ome-io.xml"/> 
    33     <testng> 
     34    <testng failureProperty="failedTest"> 
    3435      <classpath> 
    3536        <pathelement location="${test-classes.dir}"/> 
     
    3940      <jvmarg value="-mx${testng.memory}"/> 
    4041    </testng> 
     42    <fail if="failedTest"/> 
    4143  </target> 
    4244 
  • trunk/components/test-suite/build.xml

    r6712 r6745  
    1818      annotations="Javadoc" groups="all" testname="Writer tests" 
    1919      listener="loci.tests.testng.DotTestListener" 
    20       suitename="LOCI software test suite"> 
     20      suitename="LOCI software test suite" 
     21      failureProperty="failedTest"> 
    2122      <classpath> 
    2223        <pathelement location="${classes.dir}"/> 
     
    2930      <jvmarg value="-mx${testng.memory}"/> 
    3031    </testng> 
     32    <fail if="failedTest"/> 
    3133  </target> 
    3234 
     
    3638      annotations="Javadoc" groups="all" testname="All tests" 
    3739      listener="loci.tests.testng.DotTestListener" 
    38       suitename="LOCI software test suite"> 
     40      suitename="LOCI software test suite" 
     41      failureProperty="failedTest"> 
    3942      <classpath> 
    4043        <pathelement location="${classes.dir}"/> 
     
    4851      <jvmarg value="-mx${testng.memory}"/> 
    4952    </testng> 
     53    <fail if="failedTest"/> 
    5054  </target> 
    5155 
     
    5559      annotations="Javadoc" groups="config" testname="Config generation" 
    5660      listener="loci.tests.testng.DotTestListener" 
    57       suitename="LOCI software test suite"> 
     61      suitename="LOCI software test suite" 
     62      failureProperty="failedTest"> 
    5863      <classpath> 
    5964        <pathelement location="${classes.dir}"/> 
     
    6772      <jvmarg value="-mx${testng.memory}"/> 
    6873    </testng> 
     74    <fail if="failedTest"/> 
    6975  </target> 
    7076 
     
    7480      annotations="Javadoc" groups="fast" testname="Fast tests" 
    7581      listener="loci.tests.testng.DotTestListener" 
    76       suitename="LOCI software test suite"> 
     82      suitename="LOCI software test suite" 
     83      failureProperty="failedTest"> 
    7784      <classpath> 
    7885        <pathelement location="${classes.dir}"/> 
     
    8693      <jvmarg value="-mx${testng.memory}"/> 
    8794    </testng> 
     95    <fail if="failedTest"/> 
    8896  </target> 
    8997 
     
    93101      annotations="Javadoc" groups="pixels" testname="Pixels tests" 
    94102      listener="loci.tests.testng.DotTestListener" 
    95       suitename="LOCI software test suite"> 
     103      suitename="LOCI software test suite" 
     104      failureProperty="failedTest"> 
    96105      <classpath> 
    97106        <pathelement location="${classes.dir}"/> 
     
    105114      <jvmarg value="-mx${testng.memory}"/> 
    106115    </testng> 
     116    <fail if="failedTest"/> 
    107117  </target> 
    108118 
     
    112122      annotations="Javadoc" groups="xml" testname="XML tests" 
    113123      listener="loci.tests.testng.DotTestListener" 
    114       suitename="LOCI software test suite"> 
     124      suitename="LOCI software test suite" 
     125      failureProperty="failedTest"> 
    115126      <classpath> 
    116127        <pathelement location="${classes.dir}"/> 
     
    124135      <jvmarg value="-mx${testng.memory}"/> 
    125136    </testng> 
     137    <fail if="failedTest"/> 
    126138  </target> 
    127139 
     
    131143      annotations="Javadoc" groups="type" testname="Type tests" 
    132144      listener="loci.tests.testng.DotTestListener" 
    133       suitename="LOCI software test suite"> 
     145      suitename="LOCI software test suite" 
     146      failureProperty="failedTest"> 
    134147      <classpath> 
    135148        <pathelement location="${classes.dir}"/> 
     
    143156      <jvmarg value="-mx${testng.memory}"/> 
    144157    </testng> 
     158    <fail if="failedTest"/> 
    145159  </target> 
    146160 
Note: See TracChangeset for help on using the changeset viewer.