57 |
|
<property name="build.deprecation" value="false"/> |
58 |
|
<property name="build.javadoc.access" value="protected"/> |
59 |
|
|
60 |
– |
<!-- Tck options; see JSR166TestCase.java |
61 |
– |
To profile a single tck test class: |
62 |
– |
ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck |
63 |
– |
To stress test a single tck test class: |
64 |
– |
ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck |
65 |
– |
--> |
66 |
– |
<property name="jsr166.profileTests" value="false"/> |
67 |
– |
<property name="jsr166.profileThreshold" value="100"/> |
68 |
– |
<property name="jsr166.runsPerTest" value="1"/> |
69 |
– |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
70 |
– |
|
60 |
|
<!-- Build locations --> |
61 |
|
<property name="build.dir" location="build"/> |
62 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
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) --> |
194 |
|
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
195 |
|
classpath="${lib.dir}/jtreg.jar" /> |
196 |
|
|
197 |
< |
<!-- Test classpath --> |
198 |
< |
<path id="test.classpath"> |
199 |
< |
<pathelement location="${build.testcases.dir}"/> |
200 |
< |
<pathelement location="${junit.jar}"/> |
201 |
< |
</path> |
202 |
< |
|
197 |
> |
<!-- Tck options; see JSR166TestCase.java |
198 |
> |
To profile a single tck test class: |
199 |
> |
ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck |
200 |
> |
To stress test a single tck test class: |
201 |
> |
ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck |
202 |
> |
To stress test a single tck test method: |
203 |
> |
ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck |
204 |
> |
--> |
205 |
> |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
206 |
|
<macrodef name="run-tck-tests"> |
207 |
|
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
208 |
|
<attribute name="target"/> |
236 |
|
|
237 |
|
<include name="*.java"/> |
238 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
239 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
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"/> |
242 |
|
<compilerarg line="${build.args}"/> |
253 |
|
<jvmarg line="@{jvmflags}"/> |
254 |
|
|
255 |
|
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
256 |
< |
<syspropertyset id="java.util.concurrent.ForkJoinPool-properties"> |
256 |
> |
<syspropertyset id="system-properties-used-by-tck"> |
257 |
|
<propertyref prefix="java.util.concurrent.ForkJoinPool"/> |
258 |
+ |
<propertyref prefix="jsr166."/> |
259 |
|
</syspropertyset> |
260 |
|
|
268 |
– |
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
269 |
– |
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
270 |
– |
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
261 |
|
<classpath> |
262 |
|
<pathelement location="${junit.jar}"/> |
263 |
|
<pathelement location="@{workdir}/tck-classes"/> |
289 |
|
</patternset> |
290 |
|
</fileset> |
291 |
|
|
292 |
+ |
<!-- ant -Djtreg.flags=-timeoutFactor:4 --> |
293 |
+ |
<property name="jtreg.flags" value=""/> |
294 |
+ |
|
295 |
|
<macrodef name="run-jtreg-tests"> |
296 |
|
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
297 |
|
<attribute name="source" default="7"/> |
302 |
|
|
303 |
|
<sequential> |
304 |
|
|
305 |
+ |
<!-- ant -Djtreg.verbose=time,fail,error jtreg --> |
306 |
+ |
<property name="jtreg.verbose" value="nopass,fail,error"/> |
307 |
+ |
|
308 |
|
<local name="modules"/> |
309 |
|
<condition property="modules"> |
310 |
|
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
313 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
314 |
|
<delete dir="@{workdir}/JTreport" quiet="true"/> |
315 |
|
<mkdir dir="@{workdir}/JTwork/scratch"/> |
316 |
< |
<mkdir dir="@{workdir}/JTreport"/> |
316 |
> |
<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 --> |
317 |
> |
<mkdir dir="@{workdir}/JTreport/html"/> |
318 |
> |
<mkdir dir="@{workdir}/JTreport/text"/> |
319 |
|
<jtreg dir="${jtreg@{target}.src.dir}" |
320 |
|
jdk="${jdk@{target}.home}" |
321 |
|
workDir="@{workdir}/JTwork" |
324 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
325 |
|
<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
326 |
|
<arg value="-agentvm"/> |
327 |
< |
<arg value="-v:nopass,fail"/> |
327 |
> |
<arg value="-verbose:${jtreg.verbose}"/> |
328 |
|
<arg value="-vmoptions:-esa -ea"/> |
329 |
|
<arg value="-automatic"/> |
330 |
|
<arg value="-k:!ignore"/> |
331 |
|
<arg line="@{jtregflags}"/> |
332 |
+ |
<arg line="${jtreg.flags}"/> |
333 |
|
</jtreg> |
334 |
|
</sequential> |
335 |
|
</macrodef> |
392 |
|
<compilerarg line="${build.args}"/> |
393 |
|
|
394 |
|
</javac> |
395 |
+ |
|
396 |
+ |
<!-- We need jdk9's Contended annotation, but at compile time only --> |
397 |
+ |
<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/> |
398 |
|
</target> |
399 |
|
|
400 |
|
|
605 |
|
debuglevel="${build.debuglevel}" |
606 |
|
deprecation="${build.deprecation}" |
607 |
|
source="${build.sourcelevel}" |
608 |
+ |
target="${build.sourcelevel}" |
609 |
|
fork="true"> |
610 |
|
|
611 |
|
<compilerarg line="${build.args}"/> |
661 |
|
debuglevel="${build.debuglevel}" |
662 |
|
deprecation="${build.deprecation}" |
663 |
|
source="6" |
664 |
+ |
target="6" |
665 |
|
classpath="" |
666 |
|
bootclasspath="${bootclasspath6}" |
667 |
|
includeAntRuntime="false" |
691 |
|
debuglevel="${build.debuglevel}" |
692 |
|
deprecation="${build.deprecation}" |
693 |
|
source="6" |
694 |
+ |
target="6" |
695 |
|
classpath="" |
696 |
< |
bootclasspath="${bootclasspath7}" |
696 |
> |
bootclasspath="${bootclasspath6}" |
697 |
|
includeAntRuntime="false" |
698 |
|
includeJavaRuntime="false" |
699 |
|
executable="${javac8}" |
859 |
|
classpath="" |
860 |
|
bootclasspath="${bootclasspath6}" |
861 |
|
source="5" |
862 |
+ |
target="5" |
863 |
|
includeAntRuntime="false" |
864 |
|
includeJavaRuntime="false" |
865 |
|
executable="${javac7}" |
949 |
|
debuglevel="${build.debuglevel}" |
950 |
|
deprecation="${build.deprecation}" |
951 |
|
source="6" |
952 |
+ |
target="6" |
953 |
|
classpath="" |
954 |
|
bootclasspath="${bootclasspath6}" |
955 |
|
includeAntRuntime="false" |
1044 |
|
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
1045 |
|
classpath="" |
1046 |
|
source="6" |
1047 |
+ |
target="6" |
1048 |
|
includeAntRuntime="false" |
1049 |
|
includeJavaRuntime="false" |
1050 |
|
executable="${javac7}" |
1136 |
|
debuglevel="${build.debuglevel}" |
1137 |
|
deprecation="${build.deprecation}" |
1138 |
|
source="${build.jsr166e.java.version}" |
1139 |
+ |
target="${build.jsr166e.java.version}" |
1140 |
|
classpath="" |
1141 |
|
includeAntRuntime="false" |
1142 |
|
includeJavaRuntime="false" |
1163 |
|
debuglevel="${build.debuglevel}" |
1164 |
|
deprecation="${build.deprecation}" |
1165 |
|
source="${build.jsr166e.java.version}" |
1166 |
+ |
target="${build.jsr166e.java.version}" |
1167 |
|
classpath="" |
1168 |
< |
bootclasspath="${bootclasspath7}" |
1168 |
> |
bootclasspath="${bootclasspath6}" |
1169 |
|
includeAntRuntime="false" |
1170 |
|
includeJavaRuntime="false" |
1171 |
|
executable="${javac8}" |