181 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
182 |
|
|
183 |
|
<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag --> |
184 |
< |
<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/> |
185 |
< |
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
186 |
< |
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
187 |
< |
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
188 |
< |
<!-- The expected canonical location does not yet exist as of 2016-04 --> |
189 |
< |
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
190 |
< |
<property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> |
184 |
> |
<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/> |
185 |
> |
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
186 |
> |
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
187 |
> |
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
188 |
> |
<property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> |
189 |
> |
<!-- The location of jdk9 early access docs --> |
190 |
> |
<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> --> |
191 |
|
<!-- Default jdk doc location (latest stable release seems best) --> |
192 |
< |
<property name="java.docroot.url" value="${java8.docroot.url}"/> |
192 |
> |
<property name="java.docroot.url" value="${java9.docroot.url}"/> |
193 |
|
|
194 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
195 |
|
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
346 |
|
workDir="@{workdir}/JTwork"> |
347 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
348 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
349 |
< |
<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
350 |
< |
<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
349 |
> |
<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
350 |
> |
<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
351 |
|
<arg value="-agentvm"/> |
352 |
|
<arg value="-noreport"/> |
353 |
|
<arg value="-verbose:${jtreg.verbose}"/> |
610 |
|
<param name="build.main.java.version" value="10"/> |
611 |
|
</antcall> |
612 |
|
|
613 |
+ |
<!-- Clean up to avoid obscure wrong class file version bugs --> |
614 |
+ |
<antcall target="clean"/> |
615 |
+ |
|
616 |
|
</target> |
617 |
|
|
618 |
|
|
1502 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1503 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1504 |
|
jvm="${build.main.java}" fork="true"> |
1505 |
< |
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
1505 |
> |
<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/> |
1506 |
|
<formatter type="brief"/> |
1507 |
|
<classpath> |
1508 |
|
<pathelement location="${guava.dir}/guava-testlib-tests.jar"/> |