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="util/WeakHashMap/GCDuringIteration.java"/> |
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"/> |
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"/> |
276 |
|
</patternset> |
277 |
|
</fileset> |
278 |
|
|
279 |
|
<macrodef name="run-jtreg-tests"> |
280 |
< |
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
293 |
< |
<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"> |