296 |
|
</macrodef> |
297 |
|
|
298 |
|
<!-- Define jtreg test sets for different jdk versions --> |
299 |
+ |
<fileset dir="${jtreg10.src.dir}"> |
300 |
+ |
<patternset id="jdk10.jtreg.tests"> |
301 |
+ |
<include name="**/*.java"/> |
302 |
+ |
</patternset> |
303 |
+ |
</fileset> |
304 |
+ |
|
305 |
|
<fileset dir="${jtreg9.src.dir}"> |
306 |
|
<patternset id="jdk9.jtreg.tests"> |
307 |
|
<include name="**/*.java"/> |
325 |
|
|
326 |
|
<macrodef name="run-jtreg-tests"> |
327 |
|
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
322 |
– |
<attribute name="source" default="7"/> |
328 |
|
<attribute name="target"/> |
329 |
|
<attribute name="workdir"/> |
330 |
|
<attribute name="classes"/> |
416 |
|
<compilerarg value="-Xprefer:source"/> |
417 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
418 |
|
<compilerarg value="-Xlint:all"/> |
419 |
< |
<compilerarg value="-Werror"/> |
419 |
> |
<compilerarg line="--doclint-format html5"/> |
420 |
|
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
421 |
+ |
<compilerarg value="-Werror"/> |
422 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
423 |
|
<compilerarg line="${build.args}"/> |
424 |
|
|
462 |
|
access="${build.javadoc.access}" |
463 |
|
sourcepath="${src.dir}" |
464 |
|
classpath="" |
465 |
+ |
source="9" |
466 |
|
executable="${javadoc9}"> |
467 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
468 |
|
<include name="**/*.java"/> |
470 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
471 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
472 |
|
<arg value="-XDignore.symbol.file=true"/> |
473 |
+ |
<arg value="-html5"/> |
474 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
475 |
|
<arg value="-tag"/> |
476 |
|
<arg value="${javadoc.jls.option}"/> |
813 |
|
access="${build.javadoc.access}" |
814 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
815 |
|
classpath="" |
816 |
+ |
source="8" |
817 |
|
executable="${javadoc8}" |
818 |
|
failonerror = "true"> |
819 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |