26 |
|
$HOME/jdk/jdk15 |
27 |
|
$HOME/jdk/jdk16 |
28 |
|
$HOME/jdk/jdk17 |
29 |
+ |
$HOME/jdk/jdk18 |
30 |
|
where each of the above is a JDK or a symlink to same, and |
31 |
|
$HOME/jdk/src/jdk11 |
32 |
|
$HOME/jdk/src/jdk12 |
35 |
|
$HOME/jdk/src/jdk15 |
36 |
|
$HOME/jdk/src/jdk16 |
37 |
|
$HOME/jdk/src/jdk17 |
38 |
+ |
$HOME/jdk/src/jdk18 |
39 |
|
where each of the above is a JDK source tree or a symlink to same. |
40 |
|
|
41 |
|
Alternatively, define ant variables thus: |
42 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
43 |
< |
for $N in 11 .. 17 ... |
43 |
> |
for $N in 11 .. 18 ... |
44 |
|
|
45 |
|
As of 2016-03, the sources in src/main are for jdk9+ only. |
46 |
|
As of 2019-08, the sources in src/main are for jdk11+ only. |
107 |
|
<defjdklocations v="15"/> |
108 |
|
<defjdklocations v="16"/> |
109 |
|
<defjdklocations v="17"/> |
110 |
+ |
<defjdklocations v="18"/> |
111 |
|
|
112 |
|
<!-- Source locations --> |
113 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
121 |
|
<property name="jtreg15.src.dir" location="${test.src.dir}/jtreg"/> |
122 |
|
<property name="jtreg16.src.dir" location="${test.src.dir}/jtreg"/> |
123 |
|
<property name="jtreg17.src.dir" location="${test.src.dir}/jtreg"/> |
124 |
+ |
<property name="jtreg18.src.dir" location="${test.src.dir}/jtreg"/> |
125 |
|
<property name="jtreg.src.dir" location="${jtreg11.src.dir}"/> |
126 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
127 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
150 |
|
<property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/> |
151 |
|
<property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/> |
152 |
|
<property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/> |
153 |
< |
<property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/> |
154 |
< |
<property name="java17.docroot.url" value="https://download.java.net/java/early_access/jdk17/docs"/> |
153 |
> |
<property name="java16.docroot.url" value="https://docs.oracle.com/en/java/javase/16/docs"/> |
154 |
> |
<property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/> |
155 |
> |
<property name="java18.docroot.url" value="https://download.java.net/java/early_access/jdk18/docs"/> |
156 |
|
<!-- Default jdk doc location (latest stable LTS release seems best) --> |
157 |
< |
<property name="java.docroot.url" value="${java11.docroot.url}"/> |
157 |
> |
<property name="java.docroot.url" value="${java17.docroot.url}"/> |
158 |
|
|
159 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
160 |
|
<property name="java11.api.url" value="${java11.docroot.url}/api/"/> |
164 |
|
<property name="java15.api.url" value="${java15.docroot.url}/api/"/> |
165 |
|
<property name="java16.api.url" value="${java16.docroot.url}/api/"/> |
166 |
|
<property name="java17.api.url" value="${java17.docroot.url}/api/"/> |
167 |
+ |
<property name="java18.api.url" value="${java18.docroot.url}/api/"/> |
168 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
169 |
|
|
170 |
|
<!-- Define the "jtreg" task --> |
266 |
|
</sequential> |
267 |
|
</macrodef> |
268 |
|
|
269 |
+ |
<defjtregtests v="18"/> |
270 |
|
<defjtregtests v="17"/> |
271 |
|
<defjtregtests v="16"/> |
272 |
|
<defjtregtests v="15"/> |
292 |
|
<!-- ant -Djtreg.verbose=time,fail,error jtreg --> |
293 |
|
<property name="jtreg.verbose" value="nopass,fail,error"/> |
294 |
|
|
295 |
< |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
295 |
> |
<!-- concurrency > 1 mitigates slowness of some jtreg tests --> |
296 |
> |
<!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each --> |
297 |
> |
<!-- In 2020 concurrency:3 seems like a sweet spot --> |
298 |
> |
<!-- Override using: ant -Djtreg.concurrency="N" jtreg --> |
299 |
> |
<property name="jtreg.concurrency" value="3"/> |
300 |
> |
|
301 |
> |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
302 |
|
<jtreg dir="${jtreg@{target}.src.dir}" |
303 |
|
jdk="${jdk@{target}.home}" |
304 |
|
workDir="@{workdir}/JTwork"> |
305 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
306 |
< |
<arg value="-javacoptions:--patch-module=java.base=@{classes}"/> |
307 |
< |
<arg value="-vmoptions:--patch-module=java.base=@{classes}"/> |
306 |
> |
<arg value="-javacoption:--patch-module=java.base=@{classes}"/> |
307 |
> |
<arg value="-vmoption:--patch-module=java.base=@{classes}"/> |
308 |
> |
<arg value="-vmoption:-Xmx256m"/> |
309 |
> |
<arg value="-concurrency:${jtreg.concurrency}"/> |
310 |
> |
<arg value="-vmoptions:-esa -ea"/> |
311 |
|
<arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/> |
312 |
|
<arg value="-agentvm"/> |
313 |
|
<arg value="-noreport"/> |
314 |
|
<arg value="-verbose:@{verbose}"/> |
299 |
– |
<arg value="-vmoptions:-esa -ea"/> |
315 |
|
<arg value="-automatic"/> |
316 |
|
<arg value="-k:!ignore"/> |
317 |
|
<arg line="@{jtregflags}"/> |