129 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
130 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
131 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
132 |
< |
<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/> |
132 |
> |
<property name="jtreg7.src.dir" location="${test.src.dir}/jtreg-jdk7"/> |
133 |
> |
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg"/> |
134 |
> |
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
135 |
> |
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
136 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
137 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
138 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
216 |
|
source="@{compile-target}" |
217 |
|
target="@{compile-target}" |
218 |
|
classpath="${junit.jar}" |
216 |
– |
bootclasspath="@{classes}:${bootclasspath@{compile-target}}" |
219 |
|
includeAntRuntime="false" |
220 |
|
includeJavaRuntime="false" |
221 |
|
executable="${javac@{compile-target}}" |
224 |
|
<include name="*.java"/> |
225 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
226 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
227 |
+ |
<compilerarg value="-Xbootclasspath/p:@{classes}"/> |
228 |
|
<compilerarg line="${build.args}"/> |
229 |
|
<javac-elements/> |
230 |
|
|
236 |
|
fork="true"> |
237 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
238 |
|
<jvmarg line="@{jvmflags}"/> |
239 |
+ |
|
240 |
+ |
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck --> |
241 |
+ |
<syspropertyset id="java.util.concurrent.ForkJoinPool-properties"> |
242 |
+ |
<propertyref prefix="java.util.concurrent.ForkJoinPool"/> |
243 |
+ |
</syspropertyset> |
244 |
+ |
|
245 |
|
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
246 |
|
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
247 |
|
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
254 |
|
</sequential> |
255 |
|
</macrodef> |
256 |
|
|
257 |
+ |
<!-- Define jtreg test sets for different jdk versions --> |
258 |
+ |
<fileset dir="${jtreg9.src.dir}"> |
259 |
+ |
<patternset id="jdk9.jtreg.tests"> |
260 |
+ |
<include name="**/*.java"/> |
261 |
+ |
</patternset> |
262 |
+ |
</fileset> |
263 |
+ |
|
264 |
+ |
<fileset dir="${jtreg8.src.dir}"> |
265 |
+ |
<patternset id="jdk8.jtreg.tests"> |
266 |
+ |
<include name="**/*.java"/> |
267 |
+ |
<exclude name="**/SpliteratorCharacteristics.java"/> |
268 |
+ |
<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 --> |
269 |
+ |
<exclude name="**/GCDuringIteration.java"/> |
270 |
+ |
</patternset> |
271 |
+ |
</fileset> |
272 |
+ |
|
273 |
+ |
<fileset dir="${jtreg7.src.dir}"> |
274 |
+ |
<patternset id="jdk7.jtreg.tests"> |
275 |
+ |
<include name="**/*.java"/> |
276 |
+ |
</patternset> |
277 |
+ |
</fileset> |
278 |
+ |
|
279 |
|
<macrodef name="run-jtreg-tests"> |
280 |
< |
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
250 |
< |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
280 |
> |
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
281 |
|
<attribute name="source" default="7"/> |
282 |
|
<attribute name="target"/> |
283 |
|
<attribute name="workdir"/> |
288 |
|
<delete dir="@{workdir}/JTreport" quiet="true"/> |
289 |
|
<mkdir dir="@{workdir}/JTwork/scratch"/> |
290 |
|
<mkdir dir="@{workdir}/JTreport"/> |
291 |
< |
<jtreg dir="@{jtreg.src.dir}" |
291 |
> |
<jtreg dir="${jtreg@{target}.src.dir}" |
292 |
|
jdk="${jdk@{target}.home}" |
293 |
|
workDir="@{workdir}/JTwork" |
294 |
|
reportDir="@{workdir}/JTreport"> |
295 |
< |
|
295 |
> |
<patternset refid="jdk@{target}.jtreg.tests"/> |
296 |
|
<arg value="-Xbootclasspath/p:@{classes}"/> |
297 |
|
<arg value="-agentvm"/> |
298 |
|
<arg value="-v:nopass,fail"/> |
343 |
|
<compilerarg value="-Xprefer:source"/> |
344 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
345 |
|
<compilerarg value="-Xlint:all"/> |
346 |
+ |
<compilerarg value="-Werror"/> |
347 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
348 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
349 |
|
<compilerarg line="${build.args}"/> |
447 |
|
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
448 |
|
</target> |
449 |
|
|
450 |
< |
|
450 |
> |
<target name="tck" depends="test-tck" description="alias for test-tck"/> |
451 |
|
<target name="test-tck" |
452 |
|
depends="jar" |
453 |
|
description="Runs tck tests for main directly"> |
458 |
|
classes="${product.jar}"/> |
459 |
|
</target> |
460 |
|
|
461 |
+ |
<target name="test-tck-parallelism-1" |
462 |
+ |
description="Runs test-tck with given common pool parallelism"> |
463 |
+ |
<antcall target="test-tck"> |
464 |
+ |
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/> |
465 |
+ |
</antcall> |
466 |
+ |
</target> |
467 |
+ |
|
468 |
+ |
<target name="test-tck-parallelism-0" |
469 |
+ |
description="Runs test-tck with given common pool parallelism"> |
470 |
+ |
<antcall target="test-tck"> |
471 |
+ |
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/> |
472 |
+ |
</antcall> |
473 |
+ |
</target> |
474 |
+ |
|
475 |
+ |
<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/> |
476 |
|
<target name="test-jtreg" |
477 |
|
depends="jar" |
478 |
|
description="Runs jtreg tests for main using the jtreg ant task"> |
483 |
|
</target> |
484 |
|
|
485 |
|
<target name="test" |
486 |
< |
depends="test-tck, test-jtreg" |
486 |
> |
depends="test-tck, test-tck-parallelism-1, test-jtreg" |
487 |
|
description="Runs tck and jtreg tests for main"> |
488 |
|
</target> |
489 |
|
|
490 |
+ |
<target name="jtreg8" description="Runs jtreg tests with jdk8"> |
491 |
+ |
|
492 |
+ |
<antcall target="jtreg"> |
493 |
+ |
<param name="build.main.java.version" value="8"/> |
494 |
+ |
<param name="build.main.javac" value="${javac8}"/> |
495 |
+ |
</antcall> |
496 |
+ |
|
497 |
+ |
</target> |
498 |
+ |
|
499 |
|
<target name="test89" |
500 |
|
description="Runs tck and jtreg tests for main for multiple java versions"> |
501 |
|
|
562 |
|
</target> |
563 |
|
|
564 |
|
|
565 |
+ |
<target name="compile-test-loops" depends="jar" |
566 |
+ |
description="compile all the perf tests in src/test/loops"> |
567 |
+ |
|
568 |
+ |
<mkdir dir="${build.dir}/test/loops"/> |
569 |
+ |
|
570 |
+ |
<javac srcdir="${basedir}/src/test/loops" |
571 |
+ |
destdir="${build.dir}/test/loops" |
572 |
+ |
debug="${build.debug}" |
573 |
+ |
debuglevel="${build.debuglevel}" |
574 |
+ |
deprecation="${build.deprecation}" |
575 |
+ |
includeAntRuntime="false" |
576 |
+ |
includeJavaRuntime="false" |
577 |
+ |
executable="${javac9}" |
578 |
+ |
fork="true"> |
579 |
+ |
|
580 |
+ |
<include name="*.java"/> |
581 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
582 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
583 |
+ |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
584 |
+ |
<compilerarg line="${build.args}"/> |
585 |
+ |
|
586 |
+ |
</javac> |
587 |
+ |
|
588 |
+ |
</target> |
589 |
+ |
|
590 |
+ |
|
591 |
|
<!-- jsr166 4jdk7 --> |
592 |
|
|
593 |
|
<target name="4jdk7compile" |
613 |
|
<compilerarg value="-Xprefer:source"/> |
614 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
615 |
|
<compilerarg value="-Xlint:all"/> |
616 |
+ |
<compilerarg value="-Werror"/> |
617 |
|
<compilerarg line="${build.args}"/> |
618 |
|
|
619 |
|
</javac> |
718 |
|
<run-jtreg-tests |
719 |
|
target="7" |
720 |
|
workdir="${build.4jdk7.dir}" |
721 |
< |
classes="${4jdk7product.jar}" |
640 |
< |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
721 |
> |
classes="${4jdk7product.jar}"/> |
722 |
|
</target> |
723 |
|
|
724 |
|
|
800 |
|
<include name="jsr166x/**/*.java"/> |
801 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
802 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
803 |
+ |
<compilerarg value="-Werror"/> |
804 |
|
<compilerarg line="${build.args}"/> |
805 |
|
|
806 |
|
</javac> |
887 |
|
<include name="jsr166y/**/*.java"/> |
888 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
889 |
|
<compilerarg value="-Xlint:all"/> |
890 |
+ |
<compilerarg value="-Werror"/> |
891 |
|
<compilerarg line="${build.args}"/> |
892 |
|
|
893 |
|
</javac> |
975 |
|
<include name="extra166y/**/*.java"/> |
976 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
977 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
978 |
+ |
<compilerarg value="-Werror"/> |
979 |
|
<compilerarg line="${build.args}"/> |
980 |
|
|
981 |
|
</javac> |
1063 |
|
<include name="jsr166e/**/*.java"/> |
1064 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1065 |
|
<compilerarg value="-Xlint:all"/> |
1066 |
+ |
<compilerarg value="-Werror"/> |
1067 |
|
<compilerarg line="${build.args}"/> |
1068 |
|
|
1069 |
|
</javac> |
1090 |
|
<include name="jsr166e/**/*.java"/> |
1091 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1092 |
|
<compilerarg value="-Xlint:all"/> |
1093 |
+ |
<compilerarg value="-Werror"/> |
1094 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1095 |
|
|
1096 |
|
</javac> |
1194 |
|
|
1195 |
|
<target name="lint"> |
1196 |
|
<antcall target="dists"> |
1197 |
+ |
<param name="build.javadoc.access" value="public"/> |
1198 |
+ |
</antcall> |
1199 |
+ |
</target> |
1200 |
+ |
|
1201 |
+ |
<!-- Generates all doclint warnings, even for private methods (rarely useful) --> |
1202 |
+ |
<target name="lint-private"> |
1203 |
+ |
<antcall target="dist"> |
1204 |
|
<param name="build.javadoc.access" value="private"/> |
1205 |
|
</antcall> |
1206 |
|
</target> |