84 |
|
<defjdklocations v="8"/> |
85 |
|
|
86 |
|
<macrodef name="run-tck-tests"> |
87 |
< |
<attribute name="jvm"/> |
88 |
< |
<attribute name="tck.classes"/> |
87 |
> |
<attribute name="target"/> |
88 |
> |
<attribute name="workdir"/> |
89 |
|
<attribute name="product.jar" default="${product.jar}"/> |
90 |
|
<attribute name="jvmflags" default=""/> |
91 |
|
<sequential> |
92 |
< |
<java classname="JSR166TestCase" |
93 |
< |
jvm="@{jvm}" fork="true"> |
92 |
> |
|
93 |
> |
<mkdir dir="@{workdir}/tck-classes"/> |
94 |
> |
|
95 |
> |
<javac srcdir="${tck.src.dir}" |
96 |
> |
destdir="@{workdir}/tck-classes" |
97 |
> |
debug="${build.debug}" |
98 |
> |
debuglevel="${build.debuglevel}" |
99 |
> |
deprecation="${build.deprecation}" |
100 |
> |
source="6" |
101 |
> |
classpath="${junit.jar}" |
102 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
103 |
> |
includeAntRuntime="false" |
104 |
> |
includeJavaRuntime="false" |
105 |
> |
executable="${javac@{target}}" |
106 |
> |
fork="true"> |
107 |
> |
|
108 |
> |
<include name="**/*.java"/> |
109 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
110 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
111 |
> |
<compilerarg line="${build.args}"/> |
112 |
> |
</javac> |
113 |
> |
|
114 |
> |
<java classname="JSR166TestCase" jvm="${java@{target}}" fork="true"> |
115 |
|
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
116 |
|
<jvmarg line="@{jvmflags}"/> |
117 |
|
<classpath> |
118 |
|
<pathelement location="${junit.jar}"/> |
119 |
< |
<pathelement location="@{tck.classes}"/> |
119 |
> |
<pathelement location="@{workdir}/tck-classes"/> |
120 |
|
</classpath> |
121 |
|
</java> |
122 |
+ |
|
123 |
|
</sequential> |
124 |
|
</macrodef> |
125 |
|
|
170 |
|
<!-- Default jdk api doc location (latest stable release seems best) --> |
171 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
172 |
|
|
173 |
+ |
<!-- Define the "jtreg" task --> |
174 |
+ |
<!-- See the docs in "jtreg -onlineHelp" --> |
175 |
+ |
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
176 |
+ |
classpath="${lib.dir}/jtreg.jar" /> |
177 |
+ |
|
178 |
|
<!-- Test classpath --> |
179 |
|
<path id="test.classpath"> |
180 |
|
<pathelement location="${build.testcases.dir}"/> |
570 |
|
|
571 |
|
</javac> |
572 |
|
|
573 |
< |
<jar destfile="${4jdk7product.jar}" index="true"> |
547 |
< |
<fileset dir="${build.4jdk7.classes.dir}"/> |
548 |
< |
</jar> |
549 |
< |
|
550 |
< |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
551 |
< |
|
552 |
< |
<javac srcdir="${tck.src.dir}" |
553 |
< |
destdir="${build.4jdk7.tck.classes.dir}" |
554 |
< |
debug="${build.debug}" |
555 |
< |
debuglevel="${build.debuglevel}" |
556 |
< |
deprecation="${build.deprecation}" |
557 |
< |
source="6" |
558 |
< |
classpath="${junit.jar}" |
559 |
< |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
560 |
< |
includeAntRuntime="false" |
561 |
< |
includeJavaRuntime="false" |
562 |
< |
executable="${javac7}" |
563 |
< |
fork="true"> |
573 |
> |
</target> |
574 |
|
|
575 |
< |
<include name="**/*.java"/> |
576 |
< |
<compilerarg line="${build.args}"/> |
577 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
568 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
575 |
> |
<target name="4jdk7-jar" |
576 |
> |
depends="4jdk7compile" |
577 |
> |
description="Builds library jar from compiled sources"> |
578 |
|
|
579 |
< |
</javac> |
579 |
> |
<jar destfile="${4jdk7product.jar}"> |
580 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
581 |
> |
</jar> |
582 |
|
|
583 |
|
</target> |
584 |
|
|
585 |
|
|
586 |
|
<target name="4jdk7-test-tck" |
587 |
< |
depends="4jdk7compile" |
587 |
> |
depends="4jdk7-jar" |
588 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
589 |
+ |
|
590 |
|
<run-tck-tests |
591 |
< |
jvm="${java7}" |
592 |
< |
tck.classes="${build.4jdk7.tck.classes.dir}" |
591 |
> |
target="7" |
592 |
> |
workdir="${build.4jdk7.dir}" |
593 |
|
product.jar="${4jdk7product.jar}"/> |
594 |
|
</target> |
595 |
|
|
622 |
|
</junit> |
623 |
|
</target> |
624 |
|
|
625 |
+ |
<target name="4jdk7-test-jtreg" |
626 |
+ |
depends="4jdk7compile" |
627 |
+ |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
628 |
+ |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
629 |
+ |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
630 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
631 |
+ |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
632 |
+ |
<jtreg dir="${jtreg.src.dir}" |
633 |
+ |
jdk="${jdk7.home}" |
634 |
+ |
workDir="${build.4jdk7.dir}/JTwork" |
635 |
+ |
reportDir="${build.4jdk7.dir}/JTreport"> |
636 |
+ |
|
637 |
+ |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
638 |
+ |
<arg value="-agentvm"/> |
639 |
+ |
<arg value="-v:nopass,fail"/> |
640 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
641 |
+ |
<arg value="-automatic"/> |
642 |
+ |
<arg value="-k:!ignore"/> |
643 |
+ |
</jtreg> |
644 |
+ |
</target> |
645 |
+ |
|
646 |
+ |
|
647 |
+ |
<target name="4jdk7-test" |
648 |
+ |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
649 |
+ |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
650 |
+ |
</target> |
651 |
+ |
|
652 |
|
|
653 |
|
<target name="4jdk7docs" |
654 |
|
description="Builds javadocs for src/jdk7 to dist dir"> |
757 |
|
bootclasspath="${bootclasspath6}" |
758 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
759 |
|
executable="${javadoc7}" |
760 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
760 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
761 |
|
|
762 |
|
</target> |
763 |
|
|
845 |
|
bootclasspath="${bootclasspath6}" |
846 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
847 |
|
executable="${javadoc7}" |
848 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
848 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
849 |
|
|
850 |
|
</target> |
851 |
|
|
936 |
|
bootclasspath="${bootclasspath6}" |
937 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
938 |
|
executable="${javadoc7}" |
939 |
< |
additionalparam="-XDignore.symbol.file=true" /> |
939 |
> |
additionalparam="-XDignore.symbol.file=true"/> |
940 |
|
|
941 |
|
</target> |
942 |
|
|