296 |
</macrodef> |
</macrodef> |
297 |
|
|
298 |
<!-- Define jtreg test sets for different jdk versions --> |
<!-- 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}"> |
<fileset dir="${jtreg9.src.dir}"> |
306 |
<patternset id="jdk9.jtreg.tests"> |
<patternset id="jdk9.jtreg.tests"> |
307 |
<include name="**/*.java"/> |
<include name="**/*.java"/> |
325 |
|
|
326 |
<macrodef name="run-jtreg-tests"> |
<macrodef name="run-jtreg-tests"> |
327 |
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
|
<attribute name="source" default="7"/> |
|
328 |
<attribute name="target"/> |
<attribute name="target"/> |
329 |
<attribute name="workdir"/> |
<attribute name="workdir"/> |
330 |
<attribute name="classes"/> |
<attribute name="classes"/> |
462 |
access="${build.javadoc.access}" |
access="${build.javadoc.access}" |
463 |
sourcepath="${src.dir}" |
sourcepath="${src.dir}" |
464 |
classpath="" |
classpath="" |
465 |
|
source="9" |
466 |
executable="${javadoc9}"> |
executable="${javadoc9}"> |
467 |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
<fileset dir="${src.dir}" defaultexcludes="yes"> |
468 |
<include name="**/*.java"/> |
<include name="**/*.java"/> |
813 |
access="${build.javadoc.access}" |
access="${build.javadoc.access}" |
814 |
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
815 |
classpath="" |
classpath="" |
816 |
|
source="8" |
817 |
executable="${javadoc8}" |
executable="${javadoc8}" |
818 |
failonerror = "true"> |
failonerror = "true"> |
819 |
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |