148 |
<!-- Default jdk api doc location (latest stable release seems best) --> |
<!-- Default jdk api doc location (latest stable release seems best) --> |
149 |
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
150 |
|
|
151 |
|
<!-- Define the "jtreg" task --> |
152 |
|
<!-- See the docs in "jtreg -onlineHelp" --> |
153 |
|
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
154 |
|
classpath="${lib.dir}/jtreg.jar" /> |
155 |
|
|
156 |
<!-- Test classpath --> |
<!-- Test classpath --> |
157 |
<path id="test.classpath"> |
<path id="test.classpath"> |
158 |
<pathelement location="${build.testcases.dir}"/> |
<pathelement location="${build.testcases.dir}"/> |
615 |
</junit> |
</junit> |
616 |
</target> |
</target> |
617 |
|
|
618 |
|
<target name="4jdk7-test-jtreg" |
619 |
|
depends="4jdk7compile" |
620 |
|
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
621 |
|
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
622 |
|
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
623 |
|
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
624 |
|
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
625 |
|
<jtreg dir="${jtreg.src.dir}" |
626 |
|
jdk="${jdk7.home}" |
627 |
|
workDir="${build.4jdk7.dir}/JTwork" |
628 |
|
reportDir="${build.4jdk7.dir}/JTreport"> |
629 |
|
|
630 |
|
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
631 |
|
<arg value="-agentvm"/> |
632 |
|
<arg value="-v:nopass,fail"/> |
633 |
|
<arg value="-vmoptions:-esa -ea"/> |
634 |
|
<arg value="-automatic"/> |
635 |
|
<arg value="-k:!ignore"/> |
636 |
|
</jtreg> |
637 |
|
</target> |
638 |
|
|
639 |
|
|
640 |
|
<target name="4jdk7-test" |
641 |
|
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
642 |
|
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
643 |
|
</target> |
644 |
|
|
645 |
|
|
646 |
<target name="4jdk7docs" |
<target name="4jdk7docs" |
647 |
description="Builds javadocs for src/jdk7 to dist dir"> |
description="Builds javadocs for src/jdk7 to dist dir"> |
750 |
bootclasspath="${bootclasspath6}" |
bootclasspath="${bootclasspath6}" |
751 |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
752 |
executable="${javadoc7}" |
executable="${javadoc7}" |
753 |
additionalparam="-XDignore.symbol.file=true" /> |
additionalparam="-XDignore.symbol.file=true"/> |
754 |
|
|
755 |
</target> |
</target> |
756 |
|
|
838 |
bootclasspath="${bootclasspath6}" |
bootclasspath="${bootclasspath6}" |
839 |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
840 |
executable="${javadoc7}" |
executable="${javadoc7}" |
841 |
additionalparam="-XDignore.symbol.file=true" /> |
additionalparam="-XDignore.symbol.file=true"/> |
842 |
|
|
843 |
</target> |
</target> |
844 |
|
|
929 |
bootclasspath="${bootclasspath6}" |
bootclasspath="${bootclasspath6}" |
930 |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
931 |
executable="${javadoc7}" |
executable="${javadoc7}" |
932 |
additionalparam="-XDignore.symbol.file=true" /> |
additionalparam="-XDignore.symbol.file=true"/> |
933 |
|
|
934 |
</target> |
</target> |
935 |
|
|