29 |
|
Alternatively, define ant variables thus: |
30 |
|
ant -Djdk$N.home=... |
31 |
|
for $N in 6 7 8 9 ... |
32 |
+ |
|
33 |
+ |
As of 2015-09, there is incomplete hacky support for jigsaw |
34 |
+ |
Build for jigsaw using something like: |
35 |
+ |
ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist |
36 |
+ |
"docs" target is still broken. |
37 |
|
------------------------------------------------------------------------------ |
38 |
|
</description> |
39 |
|
|
57 |
|
<property name="build.deprecation" value="false"/> |
58 |
|
<property name="build.javadoc.access" value="protected"/> |
59 |
|
|
55 |
– |
<!-- Tck options; see JSR166TestCase.java |
56 |
– |
To profile a single tck test class: |
57 |
– |
ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck |
58 |
– |
To stress test a single tck test class: |
59 |
– |
ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck |
60 |
– |
--> |
61 |
– |
<property name="jsr166.profileTests" value="false"/> |
62 |
– |
<property name="jsr166.profileThreshold" value="100"/> |
63 |
– |
<property name="jsr166.runsPerTest" value="1"/> |
64 |
– |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
65 |
– |
|
60 |
|
<!-- Build locations --> |
61 |
|
<property name="build.dir" location="build"/> |
62 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
89 |
|
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
90 |
|
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
91 |
|
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
92 |
< |
<available property="jdk@{v}.have.java.base" |
92 |
> |
<local name="have.java.base"/> |
93 |
> |
<available property="have.java.base" |
94 |
|
file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/> |
95 |
|
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" |
96 |
< |
if:set="jdk@{v}.have.java.base"/> |
96 |
> |
if:set="have.java.base"/> |
97 |
|
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes" |
98 |
< |
unless:set="jdk@{v}.have.java.base"/> |
98 |
> |
unless:set="have.java.base"/> |
99 |
> |
<local name="modules"/> |
100 |
> |
<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/> |
101 |
|
<local name="boot.jar.dir"/> |
102 |
< |
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib"/> |
103 |
< |
<path id="bootclasspath@{v}"> |
102 |
> |
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib" unless:set="modules"/> |
103 |
> |
<path id="bootclasspath@{v}" unless:set="modules"> |
104 |
|
<pathelement path="${boot.jar.dir}/resources.jar"/> |
105 |
|
<pathelement path="${boot.jar.dir}/rt.jar"/> |
106 |
|
<pathelement path="${boot.jar.dir}/jsse.jar"/> |
107 |
|
<pathelement path="${boot.jar.dir}/jce.jar"/> |
108 |
|
<pathelement path="${boot.jar.dir}/charsets.jar"/> |
109 |
|
</path> |
110 |
< |
<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/> |
110 |
> |
<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/> |
111 |
|
</sequential> |
112 |
|
</macrodef> |
113 |
|
|
200 |
|
<pathelement location="${junit.jar}"/> |
201 |
|
</path> |
202 |
|
|
203 |
+ |
<!-- Tck options; see JSR166TestCase.java |
204 |
+ |
To profile a single tck test class: |
205 |
+ |
ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck |
206 |
+ |
To stress test a single tck test class: |
207 |
+ |
ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck |
208 |
+ |
To stress test a single tck test method: |
209 |
+ |
ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck |
210 |
+ |
--> |
211 |
+ |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
212 |
|
<macrodef name="run-tck-tests"> |
213 |
|
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
214 |
|
<attribute name="target"/> |
217 |
|
<attribute name="classes"/> |
218 |
|
<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/> |
219 |
|
<element name="javac-elements" optional="true"/> |
220 |
+ |
|
221 |
|
<sequential> |
222 |
|
|
223 |
+ |
<local name="modules"/> |
224 |
+ |
<condition property="modules"> |
225 |
+ |
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
226 |
+ |
</condition> |
227 |
+ |
|
228 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
229 |
|
|
230 |
|
<javac srcdir="@{tck.src.dir}" |
243 |
|
<include name="*.java"/> |
244 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
245 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
246 |
< |
<compilerarg value="-Xbootclasspath/p:@{classes}"/> |
246 |
> |
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
247 |
> |
<compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
248 |
|
<compilerarg line="${build.args}"/> |
249 |
|
<javac-elements/> |
250 |
|
|
254 |
|
failonerror="true" |
255 |
|
jvm="${java@{target}}" |
256 |
|
fork="true"> |
257 |
< |
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
257 |
> |
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
258 |
> |
<jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
259 |
|
<jvmarg line="@{jvmflags}"/> |
260 |
|
|
261 |
|
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
262 |
< |
<syspropertyset id="java.util.concurrent.ForkJoinPool-properties"> |
262 |
> |
<syspropertyset id="system-properties-used-by-tck"> |
263 |
|
<propertyref prefix="java.util.concurrent.ForkJoinPool"/> |
264 |
+ |
<propertyref prefix="jsr166."/> |
265 |
|
</syspropertyset> |
266 |
|
|
252 |
– |
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
253 |
– |
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
254 |
– |
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
267 |
|
<classpath> |
268 |
|
<pathelement location="${junit.jar}"/> |
269 |
|
<pathelement location="@{workdir}/tck-classes"/> |
302 |
|
<attribute name="workdir"/> |
303 |
|
<attribute name="classes"/> |
304 |
|
<attribute name="jtregflags" default=""/> |
305 |
+ |
|
306 |
|
<sequential> |
307 |
+ |
|
308 |
+ |
<local name="modules"/> |
309 |
+ |
<condition property="modules"> |
310 |
+ |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
311 |
+ |
</condition> |
312 |
+ |
|
313 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
314 |
|
<delete dir="@{workdir}/JTreport" quiet="true"/> |
315 |
|
<mkdir dir="@{workdir}/JTwork/scratch"/> |
319 |
|
workDir="@{workdir}/JTwork" |
320 |
|
reportDir="@{workdir}/JTreport"> |
321 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
322 |
< |
<arg value="-Xbootclasspath/p:@{classes}"/> |
322 |
> |
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
323 |
> |
<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
324 |
|
<arg value="-agentvm"/> |
325 |
|
<arg value="-v:nopass,fail"/> |
326 |
|
<arg value="-vmoptions:-esa -ea"/> |
353 |
|
depends="configure-compiler" |
354 |
|
description="Compiles src/main sources to build dir"> |
355 |
|
|
356 |
< |
<mkdir dir="${build.classes.dir}"/> |
356 |
> |
<local name="modules"/> |
357 |
> |
<condition property="modules"> |
358 |
> |
<and> |
359 |
> |
<available file="${jdk9.home}/jmods" type="dir"/> |
360 |
> |
<equals arg1="9" arg2="${build.main.java.version}"/> |
361 |
> |
</and> |
362 |
> |
</condition> |
363 |
> |
|
364 |
> |
<local name="destdir"/> |
365 |
> |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
366 |
> |
<property name="destdir" value="${build.classes.dir}" unless:set="modules"/> |
367 |
> |
|
368 |
> |
<mkdir dir="${destdir}"/> |
369 |
|
|
370 |
|
<javac srcdir="${src.dir}" |
371 |
< |
destdir="${build.classes.dir}" |
371 |
> |
destdir="${destdir}" |
372 |
|
debug="${build.debug}" |
373 |
|
debuglevel="${build.debuglevel}" |
374 |
|
deprecation="${build.deprecation}" |
379 |
|
fork="true"> |
380 |
|
|
381 |
|
<include name="**/*.java"/> |
382 |
+ |
<compilerarg value="-Xmodule:java.base" if:set="modules"/> |
383 |
|
<compilerarg value="-Xprefer:source"/> |
384 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
385 |
|
<compilerarg value="-Xlint:all"/> |
429 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
430 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
431 |
|
<arg value="-XDignore.symbol.file=true"/> |
432 |
+ |
<!-- TODO <arg value="-Xmodule:java.base"/> --> |
433 |
|
<arg value="-tag"/> |
434 |
|
<arg value="${javadoc.jls.option}"/> |
435 |
|
<arg value="-tag"/> |
563 |
|
|
564 |
|
|
565 |
|
<target name="configure-compiler"> |
566 |
+ |
<fail message="ant version too old"> |
567 |
+ |
<condition> |
568 |
+ |
<not> <antversion atleast="1.9.1"/> </not> |
569 |
+ |
</condition> |
570 |
+ |
</fail> |
571 |
|
|
572 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
573 |
|
|