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 |
+ |
</patternset> |
266 |
+ |
</fileset> |
267 |
+ |
|
268 |
+ |
<fileset dir="${jtreg.src.dir}"> |
269 |
+ |
<patternset id="jdk7.jtreg.tests"> |
270 |
+ |
<include name="**/*.java"/> |
271 |
+ |
<exclude name="util/Collection/CollectionDefaults.java"/> |
272 |
+ |
<exclude name="util/List/ListDefaults.java"/> |
273 |
+ |
<exclude name="util/Spliterator/**/*.java"/> |
274 |
+ |
<exclude name="util/concurrent/CompletableFuture/**/*.java"/> |
275 |
+ |
<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/> |
276 |
+ |
<exclude name="util/concurrent/locks/StampedLock/**/*.java"/> |
277 |
+ |
</patternset> |
278 |
+ |
</fileset> |
279 |
+ |
|
280 |
|
<macrodef name="run-jtreg-tests"> |
281 |
|
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
282 |
|
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
294 |
|
jdk="${jdk@{target}.home}" |
295 |
|
workDir="@{workdir}/JTwork" |
296 |
|
reportDir="@{workdir}/JTreport"> |
297 |
< |
|
297 |
> |
<patternset refid="jdk@{target}.jtreg.tests"/> |
298 |
|
<arg value="-Xbootclasspath/p:@{classes}"/> |
299 |
|
<arg value="-agentvm"/> |
300 |
|
<arg value="-v:nopass,fail"/> |
345 |
|
<compilerarg value="-Xprefer:source"/> |
346 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
347 |
|
<compilerarg value="-Xlint:all"/> |
348 |
+ |
<compilerarg value="-Werror"/> |
349 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
350 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
351 |
|
<compilerarg line="${build.args}"/> |
449 |
|
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
450 |
|
</target> |
451 |
|
|
452 |
< |
|
452 |
> |
<target name="tck" depends="test-tck" description="alias for test-tck"/> |
453 |
|
<target name="test-tck" |
454 |
|
depends="jar" |
455 |
|
description="Runs tck tests for main directly"> |
474 |
|
</antcall> |
475 |
|
</target> |
476 |
|
|
477 |
+ |
<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/> |
478 |
|
<target name="test-jtreg" |
479 |
|
depends="jar" |
480 |
|
description="Runs jtreg tests for main using the jtreg ant task"> |
496 |
|
<antcall target="test"> |
497 |
|
<param name="build.main.java.version" value="8"/> |
498 |
|
<param name="build.main.javac" value="${javac8}"/> |
499 |
+ |
<param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/> |
500 |
|
</antcall> |
501 |
|
|
502 |
|
<antcall target="clean"/> |
581 |
|
<compilerarg value="-Xprefer:source"/> |
582 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
583 |
|
<compilerarg value="-Xlint:all"/> |
584 |
+ |
<compilerarg value="-Werror"/> |
585 |
|
<compilerarg line="${build.args}"/> |
586 |
|
|
587 |
|
</javac> |
686 |
|
<run-jtreg-tests |
687 |
|
target="7" |
688 |
|
workdir="${build.4jdk7.dir}" |
689 |
< |
classes="${4jdk7product.jar}" |
660 |
< |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
689 |
> |
classes="${4jdk7product.jar}"/> |
690 |
|
</target> |
691 |
|
|
692 |
|
|
768 |
|
<include name="jsr166x/**/*.java"/> |
769 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
770 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
771 |
+ |
<compilerarg value="-Werror"/> |
772 |
|
<compilerarg line="${build.args}"/> |
773 |
|
|
774 |
|
</javac> |
855 |
|
<include name="jsr166y/**/*.java"/> |
856 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
857 |
|
<compilerarg value="-Xlint:all"/> |
858 |
+ |
<compilerarg value="-Werror"/> |
859 |
|
<compilerarg line="${build.args}"/> |
860 |
|
|
861 |
|
</javac> |
943 |
|
<include name="extra166y/**/*.java"/> |
944 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
945 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
946 |
+ |
<compilerarg value="-Werror"/> |
947 |
|
<compilerarg line="${build.args}"/> |
948 |
|
|
949 |
|
</javac> |
1031 |
|
<include name="jsr166e/**/*.java"/> |
1032 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1033 |
|
<compilerarg value="-Xlint:all"/> |
1034 |
+ |
<compilerarg value="-Werror"/> |
1035 |
|
<compilerarg line="${build.args}"/> |
1036 |
|
|
1037 |
|
</javac> |
1058 |
|
<include name="jsr166e/**/*.java"/> |
1059 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1060 |
|
<compilerarg value="-Xlint:all"/> |
1061 |
+ |
<compilerarg value="-Werror"/> |
1062 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1063 |
|
|
1064 |
|
</javac> |