| 175 |
|
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
| 176 |
|
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
| 177 |
|
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
| 178 |
< |
<!-- The expected canonical location does not yet exist as of 2014-07 --> |
| 178 |
> |
<!-- The expected canonical location does not yet exist as of 2015-11 --> |
| 179 |
|
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
| 180 |
|
<property name="java9.docroot.url" value="http://download.java.net/jdk9/docs"/> |
| 181 |
|
<!-- Default jdk doc location (latest stable release seems best) --> |
| 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"/> |
| 314 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
| 315 |
|
<delete dir="@{workdir}/JTreport" quiet="true"/> |
| 316 |
|
<mkdir dir="@{workdir}/JTwork/scratch"/> |
| 317 |
< |
<mkdir dir="@{workdir}/JTreport"/> |
| 317 |
> |
<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 --> |
| 318 |
> |
<mkdir dir="@{workdir}/JTreport/html"/> |
| 319 |
> |
<mkdir dir="@{workdir}/JTreport/text"/> |
| 320 |
|
<jtreg dir="${jtreg@{target}.src.dir}" |
| 321 |
|
jdk="${jdk@{target}.home}" |
| 322 |
|
workDir="@{workdir}/JTwork" |
| 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 |
|
|
| 606 |
|
debuglevel="${build.debuglevel}" |
| 607 |
|
deprecation="${build.deprecation}" |
| 608 |
|
source="${build.sourcelevel}" |
| 609 |
+ |
target="${build.sourcelevel}" |
| 610 |
|
fork="true"> |
| 611 |
|
|
| 612 |
|
<compilerarg line="${build.args}"/> |
| 662 |
|
debuglevel="${build.debuglevel}" |
| 663 |
|
deprecation="${build.deprecation}" |
| 664 |
|
source="6" |
| 665 |
+ |
target="6" |
| 666 |
|
classpath="" |
| 667 |
|
bootclasspath="${bootclasspath6}" |
| 668 |
|
includeAntRuntime="false" |
| 692 |
|
debuglevel="${build.debuglevel}" |
| 693 |
|
deprecation="${build.deprecation}" |
| 694 |
|
source="6" |
| 695 |
+ |
target="6" |
| 696 |
|
classpath="" |
| 697 |
< |
bootclasspath="${bootclasspath7}" |
| 697 |
> |
bootclasspath="${bootclasspath6}" |
| 698 |
|
includeAntRuntime="false" |
| 699 |
|
includeJavaRuntime="false" |
| 700 |
|
executable="${javac8}" |
| 860 |
|
classpath="" |
| 861 |
|
bootclasspath="${bootclasspath6}" |
| 862 |
|
source="5" |
| 863 |
+ |
target="5" |
| 864 |
|
includeAntRuntime="false" |
| 865 |
|
includeJavaRuntime="false" |
| 866 |
|
executable="${javac7}" |
| 1045 |
|
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
| 1046 |
|
classpath="" |
| 1047 |
|
source="6" |
| 1048 |
+ |
target="6" |
| 1049 |
|
includeAntRuntime="false" |
| 1050 |
|
includeJavaRuntime="false" |
| 1051 |
|
executable="${javac7}" |
| 1137 |
|
debuglevel="${build.debuglevel}" |
| 1138 |
|
deprecation="${build.deprecation}" |
| 1139 |
|
source="${build.jsr166e.java.version}" |
| 1140 |
+ |
target="${build.jsr166e.java.version}" |
| 1141 |
|
classpath="" |
| 1142 |
|
includeAntRuntime="false" |
| 1143 |
|
includeJavaRuntime="false" |
| 1164 |
|
debuglevel="${build.debuglevel}" |
| 1165 |
|
deprecation="${build.deprecation}" |
| 1166 |
|
source="${build.jsr166e.java.version}" |
| 1167 |
+ |
target="${build.jsr166e.java.version}" |
| 1168 |
|
classpath="" |
| 1169 |
< |
bootclasspath="${bootclasspath7}" |
| 1169 |
> |
bootclasspath="${bootclasspath6}" |
| 1170 |
|
includeAntRuntime="false" |
| 1171 |
|
includeJavaRuntime="false" |
| 1172 |
|
executable="${javac8}" |
