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 |
+ |
<exclude name="util/concurrent/atomic/Serial.java"/> |
280 |
+ |
</patternset> |
281 |
+ |
</fileset> |
282 |
+ |
|
283 |
|
<macrodef name="run-jtreg-tests"> |
284 |
|
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
285 |
|
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
297 |
|
jdk="${jdk@{target}.home}" |
298 |
|
workDir="@{workdir}/JTwork" |
299 |
|
reportDir="@{workdir}/JTreport"> |
300 |
< |
|
300 |
> |
<patternset refid="jdk@{target}.jtreg.tests"/> |
301 |
|
<arg value="-Xbootclasspath/p:@{classes}"/> |
302 |
|
<arg value="-agentvm"/> |
303 |
|
<arg value="-v:nopass,fail"/> |
492 |
|
description="Runs tck and jtreg tests for main"> |
493 |
|
</target> |
494 |
|
|
495 |
+ |
<target name="jtreg8" description="Runs jtreg tests with jdk8"> |
496 |
+ |
|
497 |
+ |
<antcall target="jtreg"> |
498 |
+ |
<param name="build.main.java.version" value="8"/> |
499 |
+ |
<param name="build.main.javac" value="${javac8}"/> |
500 |
+ |
</antcall> |
501 |
+ |
|
502 |
+ |
</target> |
503 |
+ |
|
504 |
|
<target name="test89" |
505 |
|
description="Runs tck and jtreg tests for main for multiple java versions"> |
506 |
|
|
567 |
|
</target> |
568 |
|
|
569 |
|
|
570 |
+ |
<target name="compile-test-loops" depends="jar" |
571 |
+ |
description="compile all the perf tests in src/test/loops"> |
572 |
+ |
|
573 |
+ |
<mkdir dir="${build.dir}/test/loops"/> |
574 |
+ |
|
575 |
+ |
<javac srcdir="${basedir}/src/test/loops" |
576 |
+ |
destdir="${build.dir}/test/loops" |
577 |
+ |
debug="${build.debug}" |
578 |
+ |
debuglevel="${build.debuglevel}" |
579 |
+ |
deprecation="${build.deprecation}" |
580 |
+ |
includeAntRuntime="false" |
581 |
+ |
includeJavaRuntime="false" |
582 |
+ |
executable="${javac9}" |
583 |
+ |
fork="true"> |
584 |
+ |
|
585 |
+ |
<include name="*.java"/> |
586 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
587 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
588 |
+ |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
589 |
+ |
<compilerarg line="${build.args}"/> |
590 |
+ |
|
591 |
+ |
</javac> |
592 |
+ |
|
593 |
+ |
</target> |
594 |
+ |
|
595 |
+ |
|
596 |
|
<!-- jsr166 4jdk7 --> |
597 |
|
|
598 |
|
<target name="4jdk7compile" |
723 |
|
<run-jtreg-tests |
724 |
|
target="7" |
725 |
|
workdir="${build.4jdk7.dir}" |
726 |
< |
classes="${4jdk7product.jar}" |
663 |
< |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
726 |
> |
classes="${4jdk7product.jar}"/> |
727 |
|
</target> |
728 |
|
|
729 |
|
|