129 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
130 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
131 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
132 |
< |
<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/> |
132 |
> |
<property name="jtreg7.src.dir" location="${test.src.dir}/jtreg-jdk7"/> |
133 |
> |
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg"/> |
134 |
> |
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
135 |
> |
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
136 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
137 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
138 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
255 |
|
</macrodef> |
256 |
|
|
257 |
|
<!-- Define jtreg test sets for different jdk versions --> |
258 |
< |
<fileset dir="${jtreg.src.dir}"> |
258 |
> |
<fileset dir="${jtreg9.src.dir}"> |
259 |
|
<patternset id="jdk9.jtreg.tests"> |
260 |
|
<include name="**/*.java"/> |
261 |
|
</patternset> |
262 |
|
</fileset> |
263 |
|
|
264 |
< |
<fileset dir="${jtreg.src.dir}"> |
264 |
> |
<fileset dir="${jtreg8.src.dir}"> |
265 |
|
<patternset id="jdk8.jtreg.tests"> |
266 |
|
<include name="**/*.java"/> |
267 |
< |
<exclude name="util/Spliterator/SpliteratorCharacteristics.java"/> |
267 |
> |
<exclude name="**/SpliteratorCharacteristics.java"/> |
268 |
> |
<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 --> |
269 |
> |
<exclude name="**/GCDuringIteration.java"/> |
270 |
|
</patternset> |
271 |
|
</fileset> |
272 |
|
|
273 |
< |
<fileset dir="${jtreg.src.dir}"> |
273 |
> |
<fileset dir="${jtreg7.src.dir}"> |
274 |
|
<patternset id="jdk7.jtreg.tests"> |
275 |
|
<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"/> |
276 |
|
</patternset> |
277 |
|
</fileset> |
278 |
|
|
279 |
|
<macrodef name="run-jtreg-tests"> |
280 |
< |
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
282 |
< |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
280 |
> |
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
281 |
|
<attribute name="source" default="7"/> |
282 |
|
<attribute name="target"/> |
283 |
|
<attribute name="workdir"/> |
288 |
|
<delete dir="@{workdir}/JTreport" quiet="true"/> |
289 |
|
<mkdir dir="@{workdir}/JTwork/scratch"/> |
290 |
|
<mkdir dir="@{workdir}/JTreport"/> |
291 |
< |
<jtreg dir="@{jtreg.src.dir}" |
291 |
> |
<jtreg dir="${jtreg@{target}.src.dir}" |
292 |
|
jdk="${jdk@{target}.home}" |
293 |
|
workDir="@{workdir}/JTwork" |
294 |
|
reportDir="@{workdir}/JTreport"> |
487 |
|
description="Runs tck and jtreg tests for main"> |
488 |
|
</target> |
489 |
|
|
490 |
+ |
<target name="jtreg8" description="Runs jtreg tests with jdk8"> |
491 |
+ |
|
492 |
+ |
<antcall target="jtreg"> |
493 |
+ |
<param name="build.main.java.version" value="8"/> |
494 |
+ |
<param name="build.main.javac" value="${javac8}"/> |
495 |
+ |
</antcall> |
496 |
+ |
|
497 |
+ |
</target> |
498 |
+ |
|
499 |
|
<target name="test89" |
500 |
|
description="Runs tck and jtreg tests for main for multiple java versions"> |
501 |
|
|
503 |
|
<antcall target="test"> |
504 |
|
<param name="build.main.java.version" value="8"/> |
505 |
|
<param name="build.main.javac" value="${javac8}"/> |
499 |
– |
<param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/> |
506 |
|
</antcall> |
507 |
|
|
508 |
|
<antcall target="clean"/> |
579 |
|
|
580 |
|
<include name="*.java"/> |
581 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
582 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
582 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
583 |
|
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
584 |
|
<compilerarg line="${build.args}"/> |
585 |
|
|