Ignore:
Timestamp:
01/03/09 13:17:22 (14 years ago)
Author:
Mark Evenson
Message:

Revert inadvertent r11528.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/nbproject/build-impl.xml

    r11528 r11529  
    6565        </condition>
    6666        <condition property="have.tests">
    67             <or>
    68                 <available file="${test.src.dir}"/>
    69             </or>
     67            <or/>
    7068        </condition>
    7169        <condition property="have.sources">
     
    126124    <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
    127125        <fail unless="src.dir">Must set src.dir</fail>
    128         <fail unless="test.src.dir">Must set test.src.dir</fail>
    129126        <fail unless="build.dir">Must set build.dir</fail>
    130127        <fail unless="dist.dir">Must set dist.dir</fail>
     
    200197            <sequential>
    201198                <junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true">
    202                     <batchtest todir="${build.test.results.dir}">
    203                         <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
    204                             <filename name="@{testincludes}"/>
    205                         </fileset>
    206                     </batchtest>
     199                    <batchtest todir="${build.test.results.dir}"/>
    207200                    <classpath>
    208201                        <path path="${run.test.classpath}"/>
     
    509502    </target>
    510503    <target if="do.depend.true" name="-compile-test-depend">
    511         <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
     504        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir=""/>
    512505    </target>
    513506    <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
    514         <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
    515         <copy todir="${build.test.classes.dir}">
    516             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    517         </copy>
     507        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir=""/>
     508        <copy todir="${build.test.classes.dir}"/>
    518509    </target>
    519510    <target name="-post-compile-test">
     
    529520        <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
    530521        <j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
    531         <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="${test.src.dir}" srcdir="${test.src.dir}"/>
    532         <copy todir="${build.test.classes.dir}">
    533             <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
    534         </copy>
     522        <j2seproject3:javac classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" sourcepath="" srcdir=""/>
     523        <copy todir="${build.test.classes.dir}"/>
    535524    </target>
    536525    <target name="-post-compile-test-single">
Note: See TracChangeset for help on using the changeset viewer.