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/test-suite/build.xml

    r6016 r6686  
    1313  <property file="build.properties"/> 
    1414 
    15   <taskdef name="testng" classpath="${component.classpath}" 
    16     classname="org.testng.TestNGAntTask"/> 
    17  
    1815  <target name="test-convert" depends="compile" 
    1916    description="run automated tests on writers"> 
    2017    <testng sourcedir="${dest.dir}" 
    21       classpath="${classes.dir}:${component.classpath}" 
    2218      annotations="Javadoc" groups="all" testname="Writer tests" 
    2319      listener="loci.tests.testng.DotTestListener" 
    2420      suitename="LOCI software test suite"> 
     21      <classpath> 
     22        <pathelement location="${classes.dir}"/> 
     23        <pathelement path="${component.classpath}"/> 
     24      </classpath> 
    2525      <classfileset file="${classes.dir}/${writer-test.class}"/> 
    2626      <sysproperty key="testng.filename" value="${testng.filename}"/> 
     
    3434    description="run all automated tests"> 
    3535    <testng sourcedir="${dest.dir}" 
    36       classpath="${classes.dir}:${component.classpath}" 
    3736      annotations="Javadoc" groups="all" testname="All tests" 
    3837      listener="loci.tests.testng.DotTestListener" 
    3938      suitename="LOCI software test suite"> 
     39      <classpath> 
     40        <pathelement location="${classes.dir}"/> 
     41        <pathelement path="${component.classpath}"/> 
     42      </classpath> 
    4043      <classfileset file="${classes.dir}/${reader-test.class}"/> 
    4144      <sysproperty key="testng.filename" value="${testng.filename}"/> 
     
    5053    description="generate config files for automated test suite"> 
    5154    <testng sourcedir="${dest.dir}" 
    52       classpath="${classes.dir}:${component.classpath}" 
    5355      annotations="Javadoc" groups="config" testname="Config generation" 
    5456      listener="loci.tests.testng.DotTestListener" 
    5557      suitename="LOCI software test suite"> 
     58      <classpath> 
     59        <pathelement location="${classes.dir}"/> 
     60        <pathelement path="${component.classpath}"/> 
     61      </classpath> 
    5662      <classfileset file="${classes.dir}/${reader-test.class}"/> 
    5763      <sysproperty key="testng.filename" value="${testng.filename}"/> 
     
    6672    description="run automated tests in group 'fast'"> 
    6773    <testng sourcedir="${dest.dir}" 
    68       classpath="${classes.dir}:${component.classpath}" 
    6974      annotations="Javadoc" groups="fast" testname="Fast tests" 
    7075      listener="loci.tests.testng.DotTestListener" 
    7176      suitename="LOCI software test suite"> 
     77      <classpath> 
     78        <pathelement location="${classes.dir}"/> 
     79        <pathelement path="${component.classpath}"/> 
     80      </classpath> 
    7281      <classfileset file="${classes.dir}/${reader-test.class}"/> 
    7382      <sysproperty key="testng.filename" value="${testng.filename}"/> 
     
    8291    description="run automated tests in group 'pixels'"> 
    8392    <testng sourcedir="${dest.dir}" 
    84       classpath="${classes.dir}:${component.classpath}" 
    8593      annotations="Javadoc" groups="pixels" testname="Pixels tests" 
    8694      listener="loci.tests.testng.DotTestListener" 
    8795      suitename="LOCI software test suite"> 
     96      <classpath> 
     97        <pathelement location="${classes.dir}"/> 
     98        <pathelement path="${component.classpath}"/> 
     99      </classpath> 
    88100      <classfileset file="${classes.dir}/${reader-test.class}"/> 
    89101      <sysproperty key="testng.filename" value="${testng.filename}"/> 
     
    98110    description="run automated tests in group 'xml'"> 
    99111    <testng sourcedir="${dest.dir}" 
    100       classpath="${classes.dir}:${component.classpath}" 
    101112      annotations="Javadoc" groups="xml" testname="XML tests" 
    102113      listener="loci.tests.testng.DotTestListener" 
    103114      suitename="LOCI software test suite"> 
     115      <classpath> 
     116        <pathelement location="${classes.dir}"/> 
     117        <pathelement path="${component.classpath}"/> 
     118      </classpath> 
    104119      <classfileset file="${classes.dir}/${reader-test.class}"/> 
    105120      <sysproperty key="testng.filename" value="${testng.filename}"/> 
Note: See TracChangeset for help on using the changeset viewer.