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