| 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"/> |
| 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"/> |
| 556 |
|
</target> |
| 557 |
|
|
| 558 |
|
|
| 559 |
+ |
<target name="compile-test-loops" depends="jar" |
| 560 |
+ |
description="compile all the perf tests in src/test/loops"> |
| 561 |
+ |
|
| 562 |
+ |
<mkdir dir="${build.dir}/test/loops"/> |
| 563 |
+ |
|
| 564 |
+ |
<javac srcdir="${basedir}/src/test/loops" |
| 565 |
+ |
destdir="${build.dir}/test/loops" |
| 566 |
+ |
debug="${build.debug}" |
| 567 |
+ |
debuglevel="${build.debuglevel}" |
| 568 |
+ |
deprecation="${build.deprecation}" |
| 569 |
+ |
includeAntRuntime="false" |
| 570 |
+ |
includeJavaRuntime="false" |
| 571 |
+ |
executable="${javac9}" |
| 572 |
+ |
fork="true"> |
| 573 |
+ |
|
| 574 |
+ |
<include name="*.java"/> |
| 575 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
| 576 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
| 577 |
+ |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
| 578 |
+ |
<compilerarg line="${build.args}"/> |
| 579 |
+ |
|
| 580 |
+ |
</javac> |
| 581 |
+ |
|
| 582 |
+ |
</target> |
| 583 |
+ |
|
| 584 |
+ |
|
| 585 |
|
<!-- jsr166 4jdk7 --> |
| 586 |
|
|
| 587 |
|
<target name="4jdk7compile" |
| 712 |
|
<run-jtreg-tests |
| 713 |
|
target="7" |
| 714 |
|
workdir="${build.4jdk7.dir}" |
| 715 |
< |
classes="${4jdk7product.jar}" |
| 663 |
< |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
| 715 |
> |
classes="${4jdk7product.jar}"/> |
| 716 |
|
</target> |
| 717 |
|
|
| 718 |
|
|
