|
Lines 732-742
Link Here
|
| 732 |
<attribute name="test.type"/> |
732 |
<attribute name="test.type"/> |
| 733 |
<attribute name="disable.apple.ui" default="false"/> |
733 |
<attribute name="disable.apple.ui" default="false"/> |
| 734 |
<sequential> |
734 |
<sequential> |
|
|
735 |
<property name="test.runner.jar" value="${build.test.@{test.type}.results.dir}/runner.jar"/> |
| 736 |
<pathconvert property="test.base.classpath" refid="test.@{test.type}.run.cp"> |
| 737 |
<firstmatchmapper> |
| 738 |
<regexpmapper from="^.*junit.*$$" to="\0"/> |
| 739 |
<regexpmapper from="^.*$$" to=""/> |
| 740 |
</firstmatchmapper> |
| 741 |
</pathconvert> |
| 742 |
<manifestclasspath property="test.runner.jar.classpath" jarfile="${test.runner.jar}" maxParentLevels="100"> |
| 743 |
<classpath refid="test.@{test.type}.run.cp"/> |
| 744 |
</manifestclasspath> |
| 745 |
<jar destfile="${test.runner.jar}"> |
| 746 |
<manifest> |
| 747 |
<attribute name="Class-Path" value="${test.runner.jar.classpath}"/> |
| 748 |
</manifest> |
| 749 |
</jar> |
| 735 |
<junit showoutput="true" fork="true" failureproperty="tests.failed" errorproperty="tests.failed" filtertrace="${test.filter.trace}" tempdir="${build.test.@{test.type}.results.dir}" timeout="${test.timeout}"> |
750 |
<junit showoutput="true" fork="true" failureproperty="tests.failed" errorproperty="tests.failed" filtertrace="${test.filter.trace}" tempdir="${build.test.@{test.type}.results.dir}" timeout="${test.timeout}"> |
| 736 |
<batchtest todir="${build.test.@{test.type}.results.dir}"> |
751 |
<batchtest todir="${build.test.@{test.type}.results.dir}"> |
| 737 |
<fileset dir="${build.test.@{test.type}.classes.dir}" includes="${test.includes}" excludes="${test.excludes}"/> |
752 |
<fileset dir="${build.test.@{test.type}.classes.dir}" includes="${test.includes}" excludes="${test.excludes}"/> |
| 738 |
</batchtest> |
753 |
</batchtest> |
| 739 |
<classpath refid="test.@{test.type}.run.cp"/> |
754 |
<classpath> |
|
|
755 |
<pathelement path="${test.base.classpath}"/> |
| 756 |
<pathelement location="${build.test.@{test.type}.results.dir}/runner.jar"/> |
| 757 |
</classpath> |
| 740 |
<syspropertyset refid="test.@{test.type}.properties"/> |
758 |
<syspropertyset refid="test.@{test.type}.properties"/> |
| 741 |
<jvmarg value="${test.bootclasspath.prepend.args}"/> |
759 |
<jvmarg value="${test.bootclasspath.prepend.args}"/> |
| 742 |
<jvmarg line="${test.run.args}"/> |
760 |
<jvmarg line="${test.run.args}"/> |
|
Lines 745-750
Link Here
|
| 745 |
<formatter type="brief" usefile="false"/> |
763 |
<formatter type="brief" usefile="false"/> |
| 746 |
<formatter type="xml"/> |
764 |
<formatter type="xml"/> |
| 747 |
</junit> |
765 |
</junit> |
|
|
766 |
<delete file="${test.runner.jar}" quiet="true"/> |
| 748 |
<fail if="tests.failed" unless="continue.after.failing.tests">Some tests failed; see details above.</fail> |
767 |
<fail if="tests.failed" unless="continue.after.failing.tests">Some tests failed; see details above.</fail> |
| 749 |
</sequential> |
768 |
</sequential> |
| 750 |
</macrodef> |
769 |
</macrodef> |