| 1 |
|
<project name="jsr166" default="usage" |
| 2 |
< |
xmlns:if="ant:if" xmlns:unless="ant:unless"> |
| 2 |
> |
xmlns:if="ant:if" xmlns:unless="ant:unless" |
| 3 |
> |
xmlns:ivy="antlib:org.apache.ivy.ant"> |
| 4 |
|
|
| 5 |
|
<description> |
| 6 |
|
------------------------------------------------------------------------------ |
| 18 |
|
itself. Because the JDK version matters and because different |
| 19 |
|
targets require different JDKs, we assume that users have created a |
| 20 |
|
hierarchy containing: |
| 20 |
– |
$HOME/jdk/jdk6 |
| 21 |
|
$HOME/jdk/jdk7 |
| 22 |
|
$HOME/jdk/jdk8 |
| 23 |
|
$HOME/jdk/jdk9 |
| 24 |
+ |
$HOME/jdk/jdk10 |
| 25 |
|
where each of the above is a JDK or a symlink to same, and |
| 25 |
– |
$HOME/jdk/src/jdk6 |
| 26 |
|
$HOME/jdk/src/jdk7 |
| 27 |
|
$HOME/jdk/src/jdk8 |
| 28 |
|
$HOME/jdk/src/jdk9 |
| 29 |
+ |
$HOME/jdk/src/jdk10 |
| 30 |
|
where each of the above is a complete JDK source tree |
| 31 |
|
(e.g. mercurial forest) or a symlink to same. |
| 32 |
|
|
| 33 |
|
Alternatively, define ant variables thus: |
| 34 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
| 35 |
< |
for $N in 6 7 8 9 ... |
| 35 |
> |
for $N in 7 8 9 10 ... |
| 36 |
|
|
| 37 |
< |
As of 2016-03, the sources in src/main are for jdk9+ only. The "docs" |
| 37 |
< |
target is currently broken. |
| 37 |
> |
As of 2016-03, the sources in src/main are for jdk9+ only. |
| 38 |
|
------------------------------------------------------------------------------ |
| 39 |
|
</description> |
| 40 |
|
|
| 63 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
| 64 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
| 65 |
|
<property name="build.loops.dir" location="${build.dir}/loops"/> |
| 66 |
– |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
| 66 |
|
|
| 67 |
|
<property name="build.4jdk7.dir" location="${build.dir}/jsr166-4jdk7"/> |
| 68 |
|
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
| 133 |
|
<defjdklocations v="7"/> |
| 134 |
|
<defjdklocations v="8"/> |
| 135 |
|
<defjdklocations v="9"/> |
| 136 |
+ |
<defjdklocations v="10"/> |
| 137 |
|
|
| 138 |
|
<!-- Source locations --> |
| 139 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
| 143 |
|
<property name="jtreg7.src.dir" location="${test.src.dir}/jtreg-jdk7"/> |
| 144 |
|
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg-jdk8"/> |
| 145 |
|
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
| 146 |
+ |
<property name="jtreg10.src.dir" location="${test.src.dir}/jtreg"/> |
| 147 |
|
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
| 148 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
| 149 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
| 253 |
|
<include name="*.java"/> |
| 254 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 255 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
| 256 |
+ |
<compilerarg value="-Xdoclint:reference/private"/> |
| 257 |
|
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
| 258 |
< |
<compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/> |
| 258 |
> |
<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
| 259 |
|
<compilerarg line="${build.args}"/> |
| 260 |
|
<javac-elements/> |
| 261 |
|
|
| 266 |
|
jvm="${java@{target}}" |
| 267 |
|
fork="true"> |
| 268 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
| 269 |
< |
<jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/> |
| 269 |
> |
<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
| 270 |
> |
<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/> |
| 271 |
> |
<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/> |
| 272 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/> |
| 273 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/> |
| 274 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/> |
| 275 |
|
<jvmarg line="@{jvmflags}"/> |
| 276 |
|
<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck --> |
| 277 |
|
<jvmarg line="${vmoptions}" if:set="vmoptions"/> |
| 302 |
|
<fileset dir="${jtreg8.src.dir}"> |
| 303 |
|
<patternset id="jdk8.jtreg.tests"> |
| 304 |
|
<include name="**/*.java"/> |
| 298 |
– |
<exclude name="**/SpliteratorCharacteristics.java"/> |
| 299 |
– |
<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 --> |
| 300 |
– |
<exclude name="**/GCDuringIteration.java"/> |
| 305 |
|
</patternset> |
| 306 |
|
</fileset> |
| 307 |
|
|
| 338 |
|
workDir="@{workdir}/JTwork"> |
| 339 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
| 340 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
| 341 |
< |
<arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/> |
| 342 |
< |
<arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/> |
| 341 |
> |
<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
| 342 |
> |
<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
| 343 |
|
<arg value="-agentvm"/> |
| 344 |
|
<arg value="-noreport"/> |
| 345 |
|
<arg value="-verbose:${jtreg.verbose}"/> |
| 401 |
|
fork="true"> |
| 402 |
|
|
| 403 |
|
<include name="**/*.java"/> |
| 404 |
< |
<compilerarg value="-Xmodule:java.base" if:set="modules"/> |
| 404 |
> |
<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/> |
| 405 |
|
<compilerarg value="-Xprefer:source"/> |
| 406 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 407 |
|
<compilerarg value="-Xlint:all"/> |
| 408 |
|
<compilerarg value="-Werror"/> |
| 409 |
< |
<compilerarg value="-Xdoclint:all/protected"/> |
| 409 |
> |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
| 410 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
| 411 |
|
<compilerarg line="${build.args}"/> |
| 412 |
|
|
| 438 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
| 439 |
|
<!-- sourcepath for packages --> |
| 440 |
|
|
| 441 |
< |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" --> |
| 442 |
< |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" --> |
| 441 |
> |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" --> |
| 442 |
> |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" --> |
| 443 |
> |
<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" --> |
| 444 |
> |
<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> --> |
| 445 |
> |
<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> --> |
| 446 |
|
<javadoc destdir="${docs.dir}" |
| 447 |
|
packagenames="none" |
| 448 |
|
link="${java9.api.url}" |
| 457 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
| 458 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
| 459 |
|
<arg value="-XDignore.symbol.file=true"/> |
| 460 |
< |
<arg value="-Xmodule:java.base"/> |
| 460 |
> |
<arg value="--patch-module=java.base=${src.dir}"/> |
| 461 |
|
<arg value="-tag"/> |
| 462 |
|
<arg value="${javadoc.jls.option}"/> |
| 463 |
|
<!-- @apiNote currently unused --> |
| 742 |
|
<compilerarg value="-Xprefer:source"/> |
| 743 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 744 |
|
<compilerarg value="-Xlint:all"/> |
| 745 |
< |
<compilerarg value="-Xdoclint:all/protected"/> |
| 745 |
> |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
| 746 |
|
<compilerarg line="${build.args}"/> |
| 747 |
|
|
| 748 |
|
</javac> |
| 1511 |
|
</antcall> |
| 1512 |
|
</target> |
| 1513 |
|
|
| 1514 |
+ |
<!-- ============================================================== |
| 1515 |
+ |
Running guava tests against jsr166 code |
| 1516 |
+ |
=================================================================== --> |
| 1517 |
+ |
|
| 1518 |
+ |
<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" --> |
| 1519 |
+ |
<!-- organisation="com.google.guava" module="guava-testlib" revision="21.0"/> --> |
| 1520 |
+ |
<!-- <property name="guava.version" value="21.0"/> --> |
| 1521 |
+ |
|
| 1522 |
+ |
<!-- HOWTO debug print a path id --> |
| 1523 |
+ |
<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> --> |
| 1524 |
+ |
<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> --> |
| 1525 |
+ |
|
| 1526 |
+ |
<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" --> |
| 1527 |
+ |
<!-- organisation="com.google.guava" module="guava-tests"/> --> |
| 1528 |
+ |
<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" --> |
| 1529 |
+ |
<!-- dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> --> |
| 1530 |
+ |
<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" --> |
| 1531 |
+ |
<!-- organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> --> |
| 1532 |
+ |
|
| 1533 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> --> |
| 1534 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> --> |
| 1535 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> --> |
| 1536 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> --> |
| 1537 |
+ |
|
| 1538 |
+ |
<!-- <ivy:retrieve pathid="guava.testlib.classpath" --> |
| 1539 |
+ |
<!-- type="*" inline="true" conf="*(private),*(public)" --> |
| 1540 |
+ |
<!-- pattern="${guava.dir}/[artifact].[ext]" --> |
| 1541 |
+ |
<!-- organisation="com.google.guava" module="guava-testlib"/> --> |
| 1542 |
+ |
|
| 1543 |
+ |
<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": --> |
| 1544 |
+ |
<!-- https://issues.apache.org/jira/browse/IVY-1444 --> |
| 1545 |
+ |
<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations --> |
| 1546 |
+ |
|
| 1547 |
+ |
<target name="init-ivy"> |
| 1548 |
+ |
<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar" |
| 1549 |
+ |
dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/> |
| 1550 |
+ |
<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" |
| 1551 |
+ |
classpath="${build.dir}/ivy.jar"/> |
| 1552 |
+ |
</target> |
| 1553 |
+ |
|
| 1554 |
+ |
<target name="guava-tests" depends="jar, init-ivy" |
| 1555 |
+ |
description="Guava tests run against jsr166 collections"> |
| 1556 |
+ |
<property name="guava.dir" value="${build.dir}/guava-testlib"/> |
| 1557 |
+ |
<mkdir dir="${guava.dir}"/> |
| 1558 |
+ |
<ivy:retrieve pathid="guava.testlib.classpath" |
| 1559 |
+ |
type="jar,bundle" inline="true" conf="default,master" |
| 1560 |
+ |
pattern="${guava.dir}/[artifact].[ext]" |
| 1561 |
+ |
organisation="com.google.guava" module="guava-testlib"/> |
| 1562 |
+ |
<property name="guava.version" value="21.0"/> |
| 1563 |
+ |
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
| 1564 |
+ |
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
| 1565 |
+ |
<junit printsummary="true" showoutput="true" haltonfailure="true" |
| 1566 |
+ |
jvm="${java9}" fork="true"> |
| 1567 |
+ |
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
| 1568 |
+ |
<formatter type="brief"/> |
| 1569 |
+ |
<classpath> |
| 1570 |
+ |
<pathelement location="${guava.dir}/guava-testlib-tests.jar"/> |
| 1571 |
+ |
<path refid="guava.testlib.classpath"/> |
| 1572 |
+ |
</classpath> |
| 1573 |
+ |
|
| 1574 |
+ |
<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" --> |
| 1575 |
+ |
<test name="com.google.common.collect.testing.OpenJdk6Tests"/> |
| 1576 |
+ |
</junit> |
| 1577 |
+ |
</target> |
| 1578 |
|
|
| 1579 |
|
</project> |
