251 |
|
</sequential> |
252 |
|
</macrodef> |
253 |
|
|
254 |
+ |
<!-- Define jtreg test sets for different jdk versions --> |
255 |
+ |
<fileset dir="${jtreg.src.dir}"> |
256 |
+ |
<patternset id="jdk9.jtreg.tests"> |
257 |
+ |
<include name="**/*.java"/> |
258 |
+ |
</patternset> |
259 |
+ |
</fileset> |
260 |
+ |
|
261 |
+ |
<fileset dir="${jtreg.src.dir}"> |
262 |
+ |
<patternset id="jdk8.jtreg.tests"> |
263 |
+ |
<include name="**/*.java"/> |
264 |
+ |
<exclude name="util/Spliterator/SpliteratorCharacteristics.java"/> |
265 |
+ |
<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 --> |
266 |
+ |
<exclude name="util/WeakHashMap/GCDuringIteration.java"/> |
267 |
+ |
</patternset> |
268 |
+ |
</fileset> |
269 |
+ |
|
270 |
+ |
<fileset dir="${jtreg.src.dir}"> |
271 |
+ |
<patternset id="jdk7.jtreg.tests"> |
272 |
+ |
<include name="**/*.java"/> |
273 |
+ |
<exclude name="util/Collection/CollectionDefaults.java"/> |
274 |
+ |
<exclude name="util/List/ListDefaults.java"/> |
275 |
+ |
<exclude name="util/Spliterator/**/*.java"/> |
276 |
+ |
<exclude name="util/concurrent/CompletableFuture/**/*.java"/> |
277 |
+ |
<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/> |
278 |
+ |
<exclude name="util/concurrent/locks/StampedLock/**/*.java"/> |
279 |
+ |
</patternset> |
280 |
+ |
</fileset> |
281 |
+ |
|
282 |
|
<macrodef name="run-jtreg-tests"> |
283 |
|
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
284 |
|
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
296 |
|
jdk="${jdk@{target}.home}" |
297 |
|
workDir="@{workdir}/JTwork" |
298 |
|
reportDir="@{workdir}/JTreport"> |
299 |
< |
|
299 |
> |
<patternset refid="jdk@{target}.jtreg.tests"/> |
300 |
|
<arg value="-Xbootclasspath/p:@{classes}"/> |
301 |
|
<arg value="-agentvm"/> |
302 |
|
<arg value="-v:nopass,fail"/> |
347 |
|
<compilerarg value="-Xprefer:source"/> |
348 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
349 |
|
<compilerarg value="-Xlint:all"/> |
350 |
+ |
<compilerarg value="-Werror"/> |
351 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
352 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
353 |
|
<compilerarg line="${build.args}"/> |
491 |
|
description="Runs tck and jtreg tests for main"> |
492 |
|
</target> |
493 |
|
|
494 |
+ |
<target name="jtreg8" description="Runs jtreg tests with jdk8"> |
495 |
+ |
|
496 |
+ |
<antcall target="jtreg"> |
497 |
+ |
<param name="build.main.java.version" value="8"/> |
498 |
+ |
<param name="build.main.javac" value="${javac8}"/> |
499 |
+ |
</antcall> |
500 |
+ |
|
501 |
+ |
</target> |
502 |
+ |
|
503 |
|
<target name="test89" |
504 |
|
description="Runs tck and jtreg tests for main for multiple java versions"> |
505 |
|
|
566 |
|
</target> |
567 |
|
|
568 |
|
|
569 |
+ |
<target name="compile-test-loops" depends="jar" |
570 |
+ |
description="compile all the perf tests in src/test/loops"> |
571 |
+ |
|
572 |
+ |
<mkdir dir="${build.dir}/test/loops"/> |
573 |
+ |
|
574 |
+ |
<javac srcdir="${basedir}/src/test/loops" |
575 |
+ |
destdir="${build.dir}/test/loops" |
576 |
+ |
debug="${build.debug}" |
577 |
+ |
debuglevel="${build.debuglevel}" |
578 |
+ |
deprecation="${build.deprecation}" |
579 |
+ |
includeAntRuntime="false" |
580 |
+ |
includeJavaRuntime="false" |
581 |
+ |
executable="${javac9}" |
582 |
+ |
fork="true"> |
583 |
+ |
|
584 |
+ |
<include name="*.java"/> |
585 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
586 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
587 |
+ |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
588 |
+ |
<compilerarg line="${build.args}"/> |
589 |
+ |
|
590 |
+ |
</javac> |
591 |
+ |
|
592 |
+ |
</target> |
593 |
+ |
|
594 |
+ |
|
595 |
|
<!-- jsr166 4jdk7 --> |
596 |
|
|
597 |
|
<target name="4jdk7compile" |
617 |
|
<compilerarg value="-Xprefer:source"/> |
618 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
619 |
|
<compilerarg value="-Xlint:all"/> |
620 |
+ |
<compilerarg value="-Werror"/> |
621 |
|
<compilerarg line="${build.args}"/> |
622 |
|
|
623 |
|
</javac> |
722 |
|
<run-jtreg-tests |
723 |
|
target="7" |
724 |
|
workdir="${build.4jdk7.dir}" |
725 |
< |
classes="${4jdk7product.jar}" |
661 |
< |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
725 |
> |
classes="${4jdk7product.jar}"/> |
726 |
|
</target> |
727 |
|
|
728 |
|
|
804 |
|
<include name="jsr166x/**/*.java"/> |
805 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
806 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
807 |
+ |
<compilerarg value="-Werror"/> |
808 |
|
<compilerarg line="${build.args}"/> |
809 |
|
|
810 |
|
</javac> |
891 |
|
<include name="jsr166y/**/*.java"/> |
892 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
893 |
|
<compilerarg value="-Xlint:all"/> |
894 |
+ |
<compilerarg value="-Werror"/> |
895 |
|
<compilerarg line="${build.args}"/> |
896 |
|
|
897 |
|
</javac> |
979 |
|
<include name="extra166y/**/*.java"/> |
980 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
981 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
982 |
+ |
<compilerarg value="-Werror"/> |
983 |
|
<compilerarg line="${build.args}"/> |
984 |
|
|
985 |
|
</javac> |
1067 |
|
<include name="jsr166e/**/*.java"/> |
1068 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1069 |
|
<compilerarg value="-Xlint:all"/> |
1070 |
+ |
<compilerarg value="-Werror"/> |
1071 |
|
<compilerarg line="${build.args}"/> |
1072 |
|
|
1073 |
|
</javac> |
1094 |
|
<include name="jsr166e/**/*.java"/> |
1095 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1096 |
|
<compilerarg value="-Xlint:all"/> |
1097 |
+ |
<compilerarg value="-Werror"/> |
1098 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1099 |
|
|
1100 |
|
</javac> |