63 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
64 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
65 |
|
<property name="build.loops.dir" location="${build.dir}/loops"/> |
66 |
– |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
66 |
|
|
67 |
|
<property name="build.4jdk7.dir" location="${build.dir}/jsr166-4jdk7"/> |
68 |
|
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
187 |
|
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
188 |
|
<!-- The expected canonical location does not yet exist as of 2016-04 --> |
189 |
|
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
190 |
< |
<property name="java9.docroot.url" value="http://http://download.java.net/java/jdk9/docs"/> |
190 |
> |
<property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> |
191 |
|
<!-- Default jdk doc location (latest stable release seems best) --> |
192 |
|
<property name="java.docroot.url" value="${java8.docroot.url}"/> |
193 |
|
|
244 |
|
classpath="${junit.jar}" |
245 |
|
includeAntRuntime="false" |
246 |
|
includeJavaRuntime="false" |
247 |
+ |
encoding="ASCII" |
248 |
|
executable="${javac@{compile-target}}" |
249 |
|
fork="true"> |
250 |
|
|
252 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
253 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
254 |
|
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
255 |
< |
<compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/> |
255 |
> |
<compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/> |
256 |
|
<compilerarg line="${build.args}"/> |
257 |
|
<javac-elements/> |
258 |
|
|
263 |
|
jvm="${java@{target}}" |
264 |
|
fork="true"> |
265 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
266 |
< |
<jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/> |
266 |
> |
<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/> |
267 |
> |
<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/> |
268 |
> |
<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/> |
269 |
> |
<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/> |
270 |
> |
<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/> |
271 |
|
<jvmarg line="@{jvmflags}"/> |
272 |
|
<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck --> |
273 |
|
<jvmarg line="${vmoptions}" if:set="vmoptions"/> |
298 |
|
<fileset dir="${jtreg8.src.dir}"> |
299 |
|
<patternset id="jdk8.jtreg.tests"> |
300 |
|
<include name="**/*.java"/> |
297 |
– |
<exclude name="**/SpliteratorCharacteristics.java"/> |
298 |
– |
<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 --> |
299 |
– |
<exclude name="**/GCDuringIteration.java"/> |
301 |
|
</patternset> |
302 |
|
</fileset> |
303 |
|
|
329 |
|
</condition> |
330 |
|
|
331 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
331 |
– |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
332 |
|
<jtreg dir="${jtreg@{target}.src.dir}" |
333 |
|
jdk="${jdk@{target}.home}" |
334 |
< |
workDir="@{workdir}/JTwork" |
335 |
< |
reportDir="@{workdir}/JTreport"> |
334 |
> |
workDir="@{workdir}/JTwork"> |
335 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
336 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
337 |
< |
<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/> |
337 |
> |
<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
338 |
> |
<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
339 |
|
<arg value="-agentvm"/> |
340 |
+ |
<arg value="-noreport"/> |
341 |
|
<arg value="-verbose:${jtreg.verbose}"/> |
342 |
|
<arg value="-vmoptions:-esa -ea"/> |
343 |
|
<arg value="-automatic"/> |
392 |
|
classpath="" |
393 |
|
includeAntRuntime="false" |
394 |
|
includeJavaRuntime="false" |
395 |
+ |
encoding="ASCII" |
396 |
|
executable="${build.main.javac}" |
397 |
|
fork="true"> |
398 |
|
|
434 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
435 |
|
<!-- sourcepath for packages --> |
436 |
|
|
437 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" --> |
438 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" --> |
439 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" --> |
440 |
+ |
<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> --> |
441 |
+ |
<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> --> |
442 |
|
<javadoc destdir="${docs.dir}" |
443 |
|
packagenames="none" |
444 |
|
link="${java9.api.url}" |
445 |
|
overview="${src.dir}/intro.html" |
446 |
|
access="${build.javadoc.access}" |
447 |
< |
sourcepath="${src.dir}:${jdk9.src.dir}" |
447 |
> |
sourcepath="${src.dir}" |
448 |
|
classpath="" |
449 |
|
executable="${javadoc9}"> |
450 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
453 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
454 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
455 |
|
<arg value="-XDignore.symbol.file=true"/> |
456 |
< |
<!-- TODO <arg value="-Xmodule:java.base"/> --> |
456 |
> |
<arg value="-Xmodule:java.base"/> |
457 |
|
<arg value="-tag"/> |
458 |
|
<arg value="${javadoc.jls.option}"/> |
459 |
+ |
<!-- @apiNote currently unused --> |
460 |
+ |
<!-- <arg value="-tag"/> --> |
461 |
+ |
<!-- <arg value="apiNote:a:API Note:"/> --> |
462 |
|
<arg value="-tag"/> |
463 |
< |
<arg value="apiNote:a:<em>API Note:</em>"/> |
463 |
> |
<arg value="implSpec:a:Implementation Requirements:"/> |
464 |
|
<arg value="-tag"/> |
465 |
< |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
466 |
< |
<arg value="-tag"/> |
467 |
< |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
468 |
< |
<!-- tags added in jdk9 --> |
469 |
< |
<arg value="-tag"/> |
470 |
< |
<arg value="revised:X"/> |
461 |
< |
<arg value="-tag"/> |
462 |
< |
<arg value="spec:X"/> |
465 |
> |
<arg value="implNote:a:Implementation Note:"/> |
466 |
> |
<!-- tags added in jdk9: currently unused --> |
467 |
> |
<!-- <arg value="-tag"/> --> |
468 |
> |
<!-- <arg value="revised:X"/> --> |
469 |
> |
<!-- <arg value="-tag"/> --> |
470 |
> |
<!-- <arg value="spec:X"/> --> |
471 |
|
</javadoc> |
472 |
|
</target> |
473 |
|
|
637 |
|
deprecation="${build.deprecation}" |
638 |
|
source="${build.sourcelevel}" |
639 |
|
target="${build.sourcelevel}" |
640 |
+ |
encoding="ASCII" |
641 |
|
fork="true"> |
642 |
|
|
643 |
|
<compilerarg line="${build.args}"/> |
665 |
|
deprecation="${build.deprecation}" |
666 |
|
includeAntRuntime="false" |
667 |
|
includeJavaRuntime="false" |
668 |
+ |
encoding="ASCII" |
669 |
|
executable="${javac9}" |
670 |
|
fork="true"> |
671 |
|
|
699 |
|
bootclasspath="${bootclasspath8}" |
700 |
|
includeAntRuntime="false" |
701 |
|
includeJavaRuntime="false" |
702 |
+ |
encoding="ASCII" |
703 |
|
executable="${javac8}" |
704 |
|
fork="true"> |
705 |
|
|
730 |
|
bootclasspath="${bootclasspath8}" |
731 |
|
includeAntRuntime="false" |
732 |
|
includeJavaRuntime="false" |
733 |
+ |
encoding="ASCII" |
734 |
|
executable="${javac8}" |
735 |
|
fork="true"> |
736 |
|
|
815 |
|
<arg value="-XDignore.symbol.file=true"/> |
816 |
|
<arg value="-tag"/> |
817 |
|
<arg value="${javadoc.jls.option}"/> |
818 |
< |
<arg value="-tag"/> |
819 |
< |
<arg value="apiNote:a:<em>API Note:</em>"/> |
818 |
> |
<!-- @apiNote currently unused --> |
819 |
> |
<!-- <arg value="-tag"/> --> |
820 |
> |
<!-- <arg value="apiNote:a:<em>API Note:</em>"/> --> |
821 |
|
<arg value="-tag"/> |
822 |
|
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
823 |
|
<arg value="-tag"/> |
871 |
|
bootclasspath="${bootclasspath6}" |
872 |
|
includeAntRuntime="false" |
873 |
|
includeJavaRuntime="false" |
874 |
+ |
encoding="ASCII" |
875 |
|
executable="${javac7}" |
876 |
|
fork="true"> |
877 |
|
|
902 |
|
bootclasspath="${bootclasspath6}" |
903 |
|
includeAntRuntime="false" |
904 |
|
includeJavaRuntime="false" |
905 |
+ |
encoding="ASCII" |
906 |
|
executable="${javac8}" |
907 |
|
fork="true"> |
908 |
|
|
1070 |
|
target="5" |
1071 |
|
includeAntRuntime="false" |
1072 |
|
includeJavaRuntime="false" |
1073 |
+ |
encoding="ASCII" |
1074 |
|
executable="${javac7}" |
1075 |
|
fork="true"> |
1076 |
|
|
1164 |
|
bootclasspath="${bootclasspath6}" |
1165 |
|
includeAntRuntime="false" |
1166 |
|
includeJavaRuntime="false" |
1167 |
+ |
encoding="ASCII" |
1168 |
|
executable="${javac7}" |
1169 |
|
fork="true"> |
1170 |
|
|
1259 |
|
target="6" |
1260 |
|
includeAntRuntime="false" |
1261 |
|
includeJavaRuntime="false" |
1262 |
+ |
encoding="ASCII" |
1263 |
|
executable="${javac7}" |
1264 |
|
fork="true"> |
1265 |
|
|