| 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="**/ConcurrentAssociateTest.java"/> |
| 278 |
+ |
<exclude name="**/ConcurrentContainsKeyTest.java"/> |
| 279 |
+ |
<exclude name="**/ConcurrentHashMap/ToArray.java"/> |
| 280 |
+ |
<exclude name="**/ConcurrentRemoveIf.java"/> |
| 281 |
+ |
<exclude name="**/COWSubList.java"/> |
| 282 |
+ |
<exclude name="**/FutureTask/NegativeTimeout.java"/> |
| 283 |
+ |
<exclude name="**/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java"/> |
| 284 |
+ |
<exclude name="**/forkjoin/SubmissionTest.java"/> |
| 285 |
+ |
<exclude name="**/StampedLock/**/*.java"/> |
| 286 |
+ |
<exclude name="**/AtomicReferenceTest.java"/> |
| 287 |
+ |
<exclude name="util/concurrent/atomic/Serial.java"/> |
| 288 |
+ |
</patternset> |
| 289 |
+ |
</fileset> |
| 290 |
+ |
|
| 291 |
|
<macrodef name="run-jtreg-tests"> |
| 292 |
|
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
| 293 |
|
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
| 305 |
|
jdk="${jdk@{target}.home}" |
| 306 |
|
workDir="@{workdir}/JTwork" |
| 307 |
|
reportDir="@{workdir}/JTreport"> |
| 308 |
< |
|
| 308 |
> |
<patternset refid="jdk@{target}.jtreg.tests"/> |
| 309 |
|
<arg value="-Xbootclasspath/p:@{classes}"/> |
| 310 |
|
<arg value="-agentvm"/> |
| 311 |
|
<arg value="-v:nopass,fail"/> |
| 500 |
|
description="Runs tck and jtreg tests for main"> |
| 501 |
|
</target> |
| 502 |
|
|
| 503 |
+ |
<target name="jtreg8" description="Runs jtreg tests with jdk8"> |
| 504 |
+ |
|
| 505 |
+ |
<antcall target="jtreg"> |
| 506 |
+ |
<param name="build.main.java.version" value="8"/> |
| 507 |
+ |
<param name="build.main.javac" value="${javac8}"/> |
| 508 |
+ |
</antcall> |
| 509 |
+ |
|
| 510 |
+ |
</target> |
| 511 |
+ |
|
| 512 |
|
<target name="test89" |
| 513 |
|
description="Runs tck and jtreg tests for main for multiple java versions"> |
| 514 |
|
|
| 575 |
|
</target> |
| 576 |
|
|
| 577 |
|
|
| 578 |
+ |
<target name="compile-test-loops" depends="jar" |
| 579 |
+ |
description="compile all the perf tests in src/test/loops"> |
| 580 |
+ |
|
| 581 |
+ |
<mkdir dir="${build.dir}/test/loops"/> |
| 582 |
+ |
|
| 583 |
+ |
<javac srcdir="${basedir}/src/test/loops" |
| 584 |
+ |
destdir="${build.dir}/test/loops" |
| 585 |
+ |
debug="${build.debug}" |
| 586 |
+ |
debuglevel="${build.debuglevel}" |
| 587 |
+ |
deprecation="${build.deprecation}" |
| 588 |
+ |
includeAntRuntime="false" |
| 589 |
+ |
includeJavaRuntime="false" |
| 590 |
+ |
executable="${javac9}" |
| 591 |
+ |
fork="true"> |
| 592 |
+ |
|
| 593 |
+ |
<include name="*.java"/> |
| 594 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
| 595 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
| 596 |
+ |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
| 597 |
+ |
<compilerarg line="${build.args}"/> |
| 598 |
+ |
|
| 599 |
+ |
</javac> |
| 600 |
+ |
|
| 601 |
+ |
</target> |
| 602 |
+ |
|
| 603 |
+ |
|
| 604 |
|
<!-- jsr166 4jdk7 --> |
| 605 |
|
|
| 606 |
|
<target name="4jdk7compile" |
| 731 |
|
<run-jtreg-tests |
| 732 |
|
target="7" |
| 733 |
|
workdir="${build.4jdk7.dir}" |
| 734 |
< |
classes="${4jdk7product.jar}" |
| 663 |
< |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
| 734 |
> |
classes="${4jdk7product.jar}"/> |
| 735 |
|
</target> |
| 736 |
|
|
| 737 |
|
|
