| 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="**/CompletableFuture/**/*.java"/> |
| 277 |
+ |
<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/> |
| 278 |
+ |
<exclude name="**/StampedLock/**/*.java"/> |
| 279 |
+ |
<exclude name="**/AtomicReferenceTest.java"/> |
| 280 |
+ |
<exclude name="util/concurrent/atomic/Serial.java"/> |
| 281 |
+ |
</patternset> |
| 282 |
+ |
</fileset> |
| 283 |
+ |
|
| 284 |
|
<macrodef name="run-jtreg-tests"> |
| 285 |
|
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
| 286 |
|
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
| 298 |
|
jdk="${jdk@{target}.home}" |
| 299 |
|
workDir="@{workdir}/JTwork" |
| 300 |
|
reportDir="@{workdir}/JTreport"> |
| 301 |
< |
|
| 301 |
> |
<patternset refid="jdk@{target}.jtreg.tests"/> |
| 302 |
|
<arg value="-Xbootclasspath/p:@{classes}"/> |
| 303 |
|
<arg value="-agentvm"/> |
| 304 |
|
<arg value="-v:nopass,fail"/> |
| 349 |
|
<compilerarg value="-Xprefer:source"/> |
| 350 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 351 |
|
<compilerarg value="-Xlint:all"/> |
| 352 |
+ |
<compilerarg value="-Werror"/> |
| 353 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
| 354 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
| 355 |
|
<compilerarg line="${build.args}"/> |
| 453 |
|
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
| 454 |
|
</target> |
| 455 |
|
|
| 456 |
< |
|
| 456 |
> |
<target name="tck" depends="test-tck" description="alias for test-tck"/> |
| 457 |
|
<target name="test-tck" |
| 458 |
|
depends="jar" |
| 459 |
|
description="Runs tck tests for main directly"> |
| 478 |
|
</antcall> |
| 479 |
|
</target> |
| 480 |
|
|
| 481 |
+ |
<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/> |
| 482 |
|
<target name="test-jtreg" |
| 483 |
|
depends="jar" |
| 484 |
|
description="Runs jtreg tests for main using the jtreg ant task"> |
| 493 |
|
description="Runs tck and jtreg tests for main"> |
| 494 |
|
</target> |
| 495 |
|
|
| 496 |
+ |
<target name="jtreg8" description="Runs jtreg tests with jdk8"> |
| 497 |
+ |
|
| 498 |
+ |
<antcall target="jtreg"> |
| 499 |
+ |
<param name="build.main.java.version" value="8"/> |
| 500 |
+ |
<param name="build.main.javac" value="${javac8}"/> |
| 501 |
+ |
</antcall> |
| 502 |
+ |
|
| 503 |
+ |
</target> |
| 504 |
+ |
|
| 505 |
|
<target name="test89" |
| 506 |
|
description="Runs tck and jtreg tests for main for multiple java versions"> |
| 507 |
|
|
| 568 |
|
</target> |
| 569 |
|
|
| 570 |
|
|
| 571 |
+ |
<target name="compile-test-loops" depends="jar" |
| 572 |
+ |
description="compile all the perf tests in src/test/loops"> |
| 573 |
+ |
|
| 574 |
+ |
<mkdir dir="${build.dir}/test/loops"/> |
| 575 |
+ |
|
| 576 |
+ |
<javac srcdir="${basedir}/src/test/loops" |
| 577 |
+ |
destdir="${build.dir}/test/loops" |
| 578 |
+ |
debug="${build.debug}" |
| 579 |
+ |
debuglevel="${build.debuglevel}" |
| 580 |
+ |
deprecation="${build.deprecation}" |
| 581 |
+ |
includeAntRuntime="false" |
| 582 |
+ |
includeJavaRuntime="false" |
| 583 |
+ |
executable="${javac9}" |
| 584 |
+ |
fork="true"> |
| 585 |
+ |
|
| 586 |
+ |
<include name="*.java"/> |
| 587 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
| 588 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
| 589 |
+ |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
| 590 |
+ |
<compilerarg line="${build.args}"/> |
| 591 |
+ |
|
| 592 |
+ |
</javac> |
| 593 |
+ |
|
| 594 |
+ |
</target> |
| 595 |
+ |
|
| 596 |
+ |
|
| 597 |
|
<!-- jsr166 4jdk7 --> |
| 598 |
|
|
| 599 |
|
<target name="4jdk7compile" |
| 619 |
|
<compilerarg value="-Xprefer:source"/> |
| 620 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 621 |
|
<compilerarg value="-Xlint:all"/> |
| 622 |
+ |
<compilerarg value="-Werror"/> |
| 623 |
|
<compilerarg line="${build.args}"/> |
| 624 |
|
|
| 625 |
|
</javac> |
| 724 |
|
<run-jtreg-tests |
| 725 |
|
target="7" |
| 726 |
|
workdir="${build.4jdk7.dir}" |
| 727 |
< |
classes="${4jdk7product.jar}" |
| 660 |
< |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
| 727 |
> |
classes="${4jdk7product.jar}"/> |
| 728 |
|
</target> |
| 729 |
|
|
| 730 |
|
|
| 806 |
|
<include name="jsr166x/**/*.java"/> |
| 807 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 808 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
| 809 |
+ |
<compilerarg value="-Werror"/> |
| 810 |
|
<compilerarg line="${build.args}"/> |
| 811 |
|
|
| 812 |
|
</javac> |
| 893 |
|
<include name="jsr166y/**/*.java"/> |
| 894 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 895 |
|
<compilerarg value="-Xlint:all"/> |
| 896 |
+ |
<compilerarg value="-Werror"/> |
| 897 |
|
<compilerarg line="${build.args}"/> |
| 898 |
|
|
| 899 |
|
</javac> |
| 981 |
|
<include name="extra166y/**/*.java"/> |
| 982 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 983 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
| 984 |
+ |
<compilerarg value="-Werror"/> |
| 985 |
|
<compilerarg line="${build.args}"/> |
| 986 |
|
|
| 987 |
|
</javac> |
| 1069 |
|
<include name="jsr166e/**/*.java"/> |
| 1070 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 1071 |
|
<compilerarg value="-Xlint:all"/> |
| 1072 |
+ |
<compilerarg value="-Werror"/> |
| 1073 |
|
<compilerarg line="${build.args}"/> |
| 1074 |
|
|
| 1075 |
|
</javac> |
| 1096 |
|
<include name="jsr166e/**/*.java"/> |
| 1097 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 1098 |
|
<compilerarg value="-Xlint:all"/> |
| 1099 |
+ |
<compilerarg value="-Werror"/> |
| 1100 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
| 1101 |
|
|
| 1102 |
|
</javac> |
