| 238 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 239 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
| 240 |
|
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
| 241 |
< |
<compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
| 241 |
> |
<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
| 242 |
|
<compilerarg line="${build.args}"/> |
| 243 |
|
<javac-elements/> |
| 244 |
|
|
| 249 |
|
jvm="${java@{target}}" |
| 250 |
|
fork="true"> |
| 251 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
| 252 |
< |
<jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
| 252 |
> |
<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
| 253 |
|
<jvmarg line="@{jvmflags}"/> |
| 254 |
|
|
| 255 |
|
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
| 256 |
|
<syspropertyset id="system-properties-used-by-tck"> |
| 257 |
|
<propertyref prefix="java.util.concurrent.ForkJoinPool"/> |
| 258 |
|
<propertyref prefix="jsr166."/> |
| 259 |
+ |
<propertyref name="test.timeout.factor"/> |
| 260 |
|
</syspropertyset> |
| 261 |
|
|
| 262 |
|
<classpath> |
| 290 |
|
</patternset> |
| 291 |
|
</fileset> |
| 292 |
|
|
| 293 |
+ |
<!-- ant -Djtreg.flags=-timeoutFactor:4 --> |
| 294 |
+ |
<property name="jtreg.flags" value=""/> |
| 295 |
+ |
|
| 296 |
|
<macrodef name="run-jtreg-tests"> |
| 297 |
|
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
| 298 |
|
<attribute name="source" default="7"/> |
| 323 |
|
reportDir="@{workdir}/JTreport"> |
| 324 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
| 325 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
| 326 |
< |
<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
| 326 |
> |
<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
| 327 |
|
<arg value="-agentvm"/> |
| 328 |
|
<arg value="-verbose:${jtreg.verbose}"/> |
| 329 |
|
<arg value="-vmoptions:-esa -ea"/> |
| 330 |
|
<arg value="-automatic"/> |
| 331 |
|
<arg value="-k:!ignore"/> |
| 332 |
|
<arg line="@{jtregflags}"/> |
| 333 |
+ |
<arg line="${jtreg.flags}"/> |
| 334 |
|
</jtreg> |
| 335 |
|
</sequential> |
| 336 |
|
</macrodef> |
| 393 |
|
<compilerarg line="${build.args}"/> |
| 394 |
|
|
| 395 |
|
</javac> |
| 396 |
+ |
|
| 397 |
+ |
<!-- We need jdk9's Contended annotation, but at compile time only --> |
| 398 |
+ |
<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/> |
| 399 |
|
</target> |
| 400 |
|
|
| 401 |
|
|
| 445 |
|
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
| 446 |
|
<arg value="-tag"/> |
| 447 |
|
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
| 448 |
+ |
<!-- tags added in jdk9 --> |
| 449 |
+ |
<arg value="-tag"/> |
| 450 |
+ |
<arg value="revised:X"/> |
| 451 |
+ |
<arg value="-tag"/> |
| 452 |
+ |
<arg value="spec:X"/> |
| 453 |
|
</javadoc> |
| 454 |
|
</target> |
| 455 |
|
|
