ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.117 by jsr166, Sun Jan 20 07:43:30 2013 UTC vs.
Revision 1.321 by jsr166, Sat Dec 12 18:58:10 2020 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 6 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17  
# Line 13 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk6
23 <  $HOME/jdk/jdk7
24 <  $HOME/jdk/jdk8
22 >  $HOME/jdk/jdk11
23 >  $HOME/jdk/jdk12
24 >  $HOME/jdk/jdk13
25 >  $HOME/jdk/jdk14
26 >  $HOME/jdk/jdk15
27 >  $HOME/jdk/jdk16
28 >  $HOME/jdk/jdk17
29    where each of the above is a JDK or a symlink to same, and
30 <  $HOME/jdk/src/jdk6
31 <  $HOME/jdk/src/jdk7
32 <  $HOME/jdk/src/jdk8
33 <  where each of the above is a complete JDK source tree
34 <  (e.g. mercurial forest) or a symlink to same.
30 >  $HOME/jdk/src/jdk11
31 >  $HOME/jdk/src/jdk12
32 >  $HOME/jdk/src/jdk13
33 >  $HOME/jdk/src/jdk14
34 >  $HOME/jdk/src/jdk15
35 >  $HOME/jdk/src/jdk16
36 >  $HOME/jdk/src/jdk17
37 >  where each of the above is a JDK source tree or a symlink to same.
38 >
39 >  Alternatively, define ant variables thus:
40 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
41 >  for $N in 11 .. 17 ...
42 >
43 >  As of 2016-03, the sources in src/main are for jdk9+ only.
44 >  As of 2019-08, the sources in src/main are for jdk11+ only.
45 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
46   ------------------------------------------------------------------------------
47    </description>
48  
49 <  <target name="usage" description="Advises user to run with -projecthelp">
50 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
49 >  <!-- Run 'ant -projecthelp' (default target) -->
50 >  <target name="usage">
51 >    <java classname="org.apache.tools.ant.Main">
52 >      <arg value="-projecthelp" />
53 >    </java>
54    </target>
55  
56 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
57  
58    <!-- User-specific settings -->
59    <property file="user.properties"/>
60  
61  
62    <!-- Compilation options -->
38  <property name="build.sourcelevel"    value="6"/>
63    <property name="build.debug"          value="true"/>
64    <property name="build.debuglevel"     value="source,lines,vars"/>
65    <property name="build.deprecation"    value="false"/>
66 +  <property name="build.javadoc.access" value="protected"/>
67  
68    <!-- Build locations -->
69    <property name="build.dir"                   location="build"/>
70    <property name="build.classes.dir"           location="${build.dir}/classes"/>
71    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
72    <property name="build.loops.dir"             location="${build.dir}/loops"/>
48  <property name="build.reports.dir"           location="${build.dir}/reports"/>
73  
74 <  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51 <  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52 <  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53 <  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54 <
55 <  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
56 <  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57 <  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58 <  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59 <
60 <  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61 <  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62 <  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63 <  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64 <
65 <  <!-- JDK binary locations -->
74 >  <!-- JDK locations -->
75    <property name="jdks.home"  location="${user.home}/jdk"/>
76  
77    <macrodef name="defjdklocations">
78      <attribute name="v"/>
79      <sequential>
80 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
81 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
82 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
83 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84 <    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
85 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86 <    <property name="bootclasspath@{v}"
87 <     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
80 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
81 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
82 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
83 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
84 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
85 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
86 >    </sequential>
87 >  </macrodef>
88 >
89 >  <macrodef name="mirror-dir">
90 >    <attribute name="src"/>
91 >    <attribute name="dst"/>
92 >    <sequential>
93 >    <delete dir="@{dst}"/>
94 >    <mkdir dir="@{dst}"/>
95 >    <copy todir="@{dst}" preservelastmodified="true">
96 >      <fileset dir="@{src}"/>
97 >    </copy>
98      </sequential>
99    </macrodef>
100  
101 <  <defjdklocations v="6"/>
102 <  <defjdklocations v="7"/>
103 <  <defjdklocations v="8"/>
101 >  <defjdklocations v="11"/>
102 >  <defjdklocations v="12"/>
103 >  <defjdklocations v="13"/>
104 >  <defjdklocations v="14"/>
105 >  <defjdklocations v="15"/>
106 >  <defjdklocations v="16"/>
107 >  <defjdklocations v="17"/>
108 >
109 >  <!-- Source locations -->
110 >  <property name="src.dir"              location="${basedir}/src/main"/>
111 >  <property name="test.src.dir"         location="${basedir}/src/test"/>
112 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
113 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
114 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
115 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
116 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
117 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
118 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
119 >  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
120 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
121 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
122 >  <property name="lib.dir"              location="${basedir}/lib"/>
123 >  <property name="dist.dir"             location="${basedir}/dist"/>
124 >  <property name="topsrc.dir"           location="${basedir}/src"/>
125 >
126 >  <!-- Javadoc locations -->
127 >  <property name="docs.dir"          location="${build.dir}/docs"/>
128 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
129 >
130 >  <!-- Jar locations -->
131 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
132 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
133 >
134 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
135 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
136 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
137 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
138 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
139 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
140 >  <!-- The location of jdk early access docs (RIP) -->
141 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
142 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
143 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
144 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
145 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
146 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
147 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
148 >  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
149 >  <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
150 >  <property name="java17.docroot.url" value="https://download.java.net/java/early_access/jdk17/docs"/>
151 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
152 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
153 >
154 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
155 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
156 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
157 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
158 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
159 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
160 >  <property name="java16.api.url"     value="${java16.docroot.url}/api/"/>
161 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
162 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
163 >
164 >  <!-- Define the "jtreg" task -->
165 >  <!-- See the docs in "jtreg -onlineHelp" -->
166 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
167 >           classpath="${lib.dir}/jtreg.jar" />
168  
169 +  <!-- Tck configuration options; see JSR166TestCase.java
170 +   To profile a single tck test class:
171 +   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
172 +   To stress test a single tck test class:
173 +   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
174 +   To stress test a single tck test method:
175 +   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
176 +  -->
177 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
178    <macrodef name="run-tck-tests">
179 +    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
180      <attribute name="target"/>
181 +    <attribute name="compile-target" default="@{target}"/>
182      <attribute name="workdir"/>
183 <    <attribute name="product.jar" default="${product.jar}"/>
184 <    <attribute name="jvmflags" default=""/>
183 >    <attribute name="classes"/>
184 >    <!--
185 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
186 >    -->
187 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
188 >    <element name="javac-elements" optional="true"/>
189 >
190      <sequential>
191  
192      <mkdir dir="@{workdir}/tck-classes"/>
193  
194 <    <javac srcdir="${tck.src.dir}"
194 >    <javac srcdir="@{tck.src.dir}"
195             destdir="@{workdir}/tck-classes"
196             debug="${build.debug}"
197             debuglevel="${build.debuglevel}"
198             deprecation="${build.deprecation}"
199 <           source="6"
199 >           source="@{compile-target}"
200 >           target="@{compile-target}"
201             classpath="${junit.jar}"
102           bootclasspath="@{product.jar}:${bootclasspath6}"
202             includeAntRuntime="false"
203             includeJavaRuntime="false"
204 <           executable="${javac@{target}}"
204 >           encoding="ASCII"
205 >           executable="${javac@{compile-target}}"
206             fork="true">
207  
208 <      <include name="**/*.java"/>
208 >      <include name="*.java"/>
209        <compilerarg value="-XDignore.symbol.file=true"/>
210 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
210 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
211 >      <compilerarg value="-Xdoclint:reference/private"/>
212 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
213        <compilerarg line="${build.args}"/>
214 +      <javac-elements/>
215 +
216      </javac>
217  
218 <    <java classname="JSR166TestCase"
218 >    <java classname="${jsr166.tckTestClass}"
219            failonerror="true"
220            jvm="${java@{target}}"
221            fork="true">
222 <        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
223 <        <jvmarg line="@{jvmflags}"/>
224 <        <classpath>
225 <          <pathelement location="${junit.jar}"/>
226 <          <pathelement location="@{workdir}/tck-classes"/>
227 <        </classpath>
222 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
223 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
224 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
225 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
226 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
227 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
228 >        <jvmarg line="@{jvmflags}"/>
229 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
230 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
231 >
232 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
233 >        <syspropertyset id="system-properties-used-by-tck">
234 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
235 >          <propertyref prefix="jsr166."/>
236 >          <propertyref name="test.timeout.factor"/>
237 >        </syspropertyset>
238 >
239 >        <classpath>
240 >          <pathelement location="${junit.jar}"/>
241 >          <pathelement location="@{workdir}/tck-classes"/>
242 >        </classpath>
243      </java>
244  
245      </sequential>
246    </macrodef>
247  
248 <  <!-- Source locations -->
249 <  <property name="src.dir"              location="${basedir}/src/main"/>
250 <  <property name="test.src.dir"         location="${basedir}/src/test"/>
251 <  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
252 <  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
253 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
254 <  <property name="lib.dir"              location="${basedir}/lib"/>
255 <  <property name="dist.dir"             location="${basedir}/dist"/>
256 <  <property name="topsrc.dir"           location="${basedir}/src"/>
257 <  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
258 <  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
259 <  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
260 <  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
261 <  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
143 <
144 <  <!-- Distribution locations -->
145 <  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
146 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
147 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
148 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
149 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
150 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
248 >  <!-- Define jtreg test sets for different jdk versions -->
249 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
250 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
251 >  <property name="jtreg.test.pattern" value="**/*.java"/>
252 >  <macrodef name="defjtregtests">
253 >    <attribute name="v"/>
254 >    <sequential>
255 >      <fileset dir="${jtreg@{v}.src.dir}">
256 >        <patternset id="jdk@{v}.jtreg.tests">
257 >          <include name="${jtreg.test.pattern}"/>
258 >        </patternset>
259 >      </fileset>
260 >    </sequential>
261 >  </macrodef>
262  
263 <  <!-- Jar locations -->
264 <  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
265 <  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
266 <  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
267 <  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
268 <  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
269 <  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
159 <  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
263 >  <defjtregtests v="17"/>
264 >  <defjtregtests v="16"/>
265 >  <defjtregtests v="15"/>
266 >  <defjtregtests v="14"/>
267 >  <defjtregtests v="13"/>
268 >  <defjtregtests v="12"/>
269 >  <defjtregtests v="11"/>
270  
271 <  <!-- Bootclasspath argument -->
272 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
271 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
272 >  <property name="jtreg.flags" value=""/>
273  
274 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
275 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
276 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
277 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
278 <
279 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
280 <  <!-- The below does not yet exist as of 2012-11 -->
281 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
274 >  <macrodef name="run-jtreg-tests">
275 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
276 >    <attribute name="target"/>
277 >    <attribute name="workdir"/>
278 >    <attribute name="classes"/>
279 >    <attribute name="verbose" default="${jtreg.verbose}"/>
280 >    <attribute name="jtregflags" default=""/>
281 >    <element name="jtreg-elements" optional="true"/>
282  
283 <  <!-- Default jdk api doc location (latest stable release seems best) -->
174 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
283 >    <sequential>
284  
285 <  <!-- Define the "jtreg" task -->
286 <  <!-- See the docs in "jtreg -onlineHelp" -->
178 <  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
179 <           classpath="${lib.dir}/jtreg.jar" />
285 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
286 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
287  
288 <  <!-- Test classpath -->
289 <  <path id="test.classpath">
290 <    <pathelement location="${build.testcases.dir}"/>
291 <    <pathelement location="${junit.jar}"/>
292 <  </path>
288 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
289 >    <jtreg dir="${jtreg@{target}.src.dir}"
290 >           jdk="${jdk@{target}.home}"
291 >           workDir="@{workdir}/JTwork">
292 >      <patternset refid="jdk@{target}.jtreg.tests"/>
293 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
294 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
295 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
296 >      <arg value="-agentvm"/>
297 >      <arg value="-noreport"/>
298 >      <arg value="-verbose:@{verbose}"/>
299 >      <arg value="-vmoptions:-esa -ea"/>
300 >      <arg value="-automatic"/>
301 >      <arg value="-k:!ignore"/>
302 >      <arg line="@{jtregflags}"/>
303 >      <arg line="${jtreg.flags}"/>
304 >      <jtreg-elements/>
305 >    </jtreg>
306 >    </sequential>
307 >  </macrodef>
308  
309    <!-- ALoops classpath -->
310    <path id="loops.classpath">
# Line 190 | Line 312
312    </path>
313  
314    <!-- Support @jls tag, used in jdk8+ javadoc -->
315 <  <!-- TODO: How do we get &trade to work? -->
316 <  <!-- TODO: Why isn't @jls a "standard" tag? -->
195 <  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
196 <  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
315 >  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
316 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
317    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
318  
319    <!-- Main targets -->
320  
321 +  <!-- Default values: may seem strange ... -->
322 +  <!-- At runtime, target latest LTS, i.e. jdk11 -->
323 +  <!-- But at build time, target jdk9, for maximal binary portability -->
324 +  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
325 +  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
326 +    o override-methods=summary
327 +    o {@systemProperty ...}
328 +    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
329 +    o 8202628: javadoc generates bad links in TestModules.java
330 +    -->
331 +  <property name="java.runtime.target" value="11"/>
332 +  <property name="build.main.java" value="${java11}"/>
333 +  <property name="build.main.javac" value="${javac11}"/>
334 +  <property name="build.main.javadoc" value="${javadoc12}"/>
335 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
336 +
337    <target name="dists"
338 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
338 >          depends="dist"
339            description="Builds all public jars and docs"/>
340  
341    <target name="compile"
342            depends="configure-compiler"
343            description="Compiles src/main sources to build dir">
344  
345 <    <mkdir dir="${build.classes.dir}"/>
345 >    <local name="destdir"/>
346 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
347 >
348 >    <mkdir dir="${destdir}"/>
349  
350      <javac srcdir="${src.dir}"
351 <           destdir="${build.classes.dir}"
351 >           destdir="${destdir}"
352             debug="${build.debug}"
353             debuglevel="${build.debuglevel}"
354             deprecation="${build.deprecation}"
355             classpath=""
356             includeAntRuntime="false"
357             includeJavaRuntime="false"
358 <           executable="${javac8}"
358 >           encoding="ASCII"
359 >           executable="${build.main.javac}"
360             fork="true">
361  
362        <include name="**/*.java"/>
363 <      <compilerarg line="${build.args}"/>
363 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
364 >      <compilerarg value="-Xprefer:source"/>
365        <compilerarg value="-XDignore.symbol.file=true"/>
366 <      <compilerarg value="-Xlint:all"/>
367 <
368 < <!--
369 <      <exclude name="java/lang/**"/>
366 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
367 >      <compilerarg value="-Xlint:all,-removal"/>
368 >      <compilerarg line="--doclint-format html5"/>
369 > <!--  Temporarily disable doclint for private elements, due to -->
370 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
371 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
372 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
373 >      <compilerarg value="-Xdoclint:all/protected"/>
374 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
375 >      <compilerarg value="-Werror"/>
376 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
377        <compilerarg line="${build.args}"/>
230      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
231 -->
378  
379      </javac>
234
380    </target>
381  
382  
238
383    <target name="jar"
384            depends="compile"
385 <          description="Builds library jar from compiled sources">
386 <
385 >          description="Builds library jar for src/main from compiled sources">
386 >    <local name="subdir"/>
387 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
388      <jar destfile="${product.jar}">
389 <      <fileset dir="${build.classes.dir}"/>
389 >      <fileset dir="${build.classes.dir}${subdir}"/>
390 >      <manifest>
391 >        <attribute name="Built-By" value="${user.name}"/>
392 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
393 >      </manifest>
394      </jar>
246
395    </target>
396  
397  
250
251  <target name="test"
252          depends="configure-tests, report-tests"
253          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
254
255
256
398    <target name="docs"
399            description="Builds javadocs for src/main to dist dir">
400  
401 <    <delete dir="${dist.javadocs.dir}"/>
402 <    <mkdir dir="${dist.javadocs.dir}"/>
401 >    <delete dir="${docs.dir}" quiet="true"/>
402 >    <mkdir dir="${docs.dir}"/>
403 >
404 >    <!-- old school frames via docs/index.html?overview-summary.html -->
405 >    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
406 >    <local name="use-frames"/>
407 >    <condition property="use-frames">
408 >      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
409 >    </condition>
410  
411      <!-- the packagenames="none" hack below prevents scanning the -->
412      <!-- sourcepath for packages -->
413  
414 <    <javadoc destdir="${dist.javadocs.dir}"
414 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
415 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
416 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
417 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
418 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
419 >    <javadoc destdir="${docs.dir}"
420               packagenames="none"
421 <             link="${jdkapi8docs.url}"
421 >             link="${java.api.url}"
422               overview="${src.dir}/intro.html"
423 <             sourcepath="${src.dir}:${jdk8src.dir}"
423 >             access="${build.javadoc.access}"
424 >             sourcepath="${src.dir}"
425               classpath=""
426 <             executable="${javadoc8}">
427 <      <arg value="-XDignore.symbol.file=true"/>
428 <      <arg value="-tag"/>
275 <      <arg value="${javadoc.jls.option}"/>
426 >             source="${build.main.javadoc.source}"
427 >             executable="${build.main.javadoc}">
428 > <!-- TODO: JDK-8214571 failonerror = "true" -->
429        <fileset dir="${src.dir}" defaultexcludes="yes">
430 <        <include name="**/*.java"/>
430 >        <include name="java/**/*.java"/>
431        </fileset>
432 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
433 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
434 +      <arg value="-quiet"/>
435 +      <arg value="-XDignore.symbol.file=true"/>
436 +      <arg value="-html5"/>
437 +      <arg value="-Xdoclint:all,-missing"/>
438 +      <arg value="--patch-module=java.base=${src.dir}"/>
439 +      <arg value="--frames" if:set="use-frames"/>
440 +      <arg value="--override-methods=summary"/>
441 +      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
442 +      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
443 +      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
444 +      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
445 + <!-- tags added in jdk9: currently unused -->
446 + <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
447 + <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
448      </javadoc>
280
449    </target>
450  
451  
284
452    <target name="dist"
453 <          depends="dist-clean, dist-jar, docs"
453 >          depends="dist-clean, dist-jar, dist-docs"
454            description="Puts all distributable products in single hierarchy"/>
455  
456  
290  <target name="release"
291          depends="dist"
292          description="Puts entire CVS tree, plus distribution productions, in a jar">
293
294    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
295
296    <jar basedir="${basedir}" destfile="${release.jar}">
297      <!-- <exclude name="build/**"/> -->
298      <exclude name="${release.jar}"/>
299      <exclude name="user.properties"/>
300      <exclude name="etc/notes/**"/>
301      <exclude name="src/emulation/**"/>
302      <exclude name="**/SyntaxTest.java"/>
303      <exclude name="**/SuperfluousAbstract.java"/>
304    </jar>
305
306  </target>
307
308
309
457    <target name="clean"
458            description="Removes all build products">
312
459      <delete dir="${build.dir}"/>
314
460    </target>
461  
462  
318
463    <target name="dist-clean"
464            description="Removes all build and distribution products">
465 <
465 >    <delete dir="${build.dir}"/>
466      <delete dir="${dist.dir}"/>
323
467    </target>
468  
469  
327
328  <!-- Internal targets -->
329
330
470    <target name="dist-jar"
471            depends="clean, jar">
333
472      <copy file="${product.jar}" todir="${dist.dir}"/>
335
473    </target>
474  
475 <
476 <  <target name="compile-tests"
477 <          depends="jar">
341 <
342 <    <mkdir dir="${build.testcases.dir}"/>
343 <
344 <    <javac srcdir="${tck.src.dir}"
345 <           destdir="${build.testcases.dir}"
346 <           debug="${build.debug}"
347 <           debuglevel="${build.debuglevel}"
348 <           deprecation="${build.deprecation}"
349 <           source="6"
350 <           classpath="${junit.jar}"
351 <           bootclasspath="${product.jar}:${bootclasspath6}"
352 <           includeAntRuntime="false"
353 <           includeJavaRuntime="false"
354 <           executable="${javac8}"
355 <           fork="true">
356 <
357 <      <include name="**/*.java"/>
358 <      <compilerarg line="${build.args}"/>
359 <      <compilerarg value="-XDignore.symbol.file=true"/>
360 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
361 <
362 <    </javac>
363 <
364 <    <javac srcdir="${test.src.dir}"
365 <           destdir="${build.testcases.dir}"
366 <           debug="${build.debug}"
367 <           debuglevel="${build.debuglevel}"
368 <           deprecation="${build.deprecation}"
369 <           source="6"
370 <           classpath=""
371 <           bootclasspath="${product.jar}:${bootclasspath6}"
372 <           includeAntRuntime="false"
373 <           includeJavaRuntime="false"
374 <           executable="${javac8}"
375 <           fork="true">
376 <
377 <      <include name="jsr166/test/**/*.java"/>
378 <
379 <      <compilerarg line="${build.args}"/>
380 <      <compilerarg value="-XDignore.symbol.file=true"/>
381 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
382 <
383 <    </javac>
384 <
385 < <!--
386 <    <javac srcdir="${jtreg.src.dir}"
387 <          destdir="${build.testcases.dir}"
388 <            debug="${build.debug}"
389 <       debuglevel="${build.debuglevel}"
390 <      deprecation="${build.deprecation}"
391 <           source="${build.sourcelevel}"
392 <             fork="true">
393 <
394 <      <compilerarg value="${bootclasspath.args}"/>
395 <      <compilerarg line="${build.args}"/>
396 <      <compilerarg value="-XDignore.symbol.file=true"/>
397 <
398 <    </javac>
399 < -->
400 <
475 >  <target name="dist-docs"
476 >          depends="clean, docs">
477 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
478    </target>
479  
480 +  <target name="tck"
481 +          depends="jar"
482 +          description="Runs tck tests for src/main directly">
483  
484 <  <target name="run-tests"
485 <          depends="compile-tests">
486 <
487 <    <!-- May be overridden by user.properties -->
488 <    <property name="testcase" value="*"/>
489 <
490 <    <mkdir dir="${build.reports.dir}"/>
491 <
492 <    <junit printsummary="true"
493 <             showoutput="true"
494 <          errorProperty="junit.failed"
495 <        failureProperty="junit.failed"
496 <                    dir="${build.reports.dir}"
497 <                    jvm="${java8}"
498 <                   fork="true">
499 <
500 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
501 <      <jvmarg value="-server"/>
502 <      <jvmarg value="-showversion"/>
503 <
504 <      <classpath refid="test.classpath"/>
505 <
506 <      <formatter type="xml"/>
507 <
508 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
509 <        <fileset dir="${tck.src.dir}">
510 <          <include name="**/${testcase}Test.java"/>
511 <        </fileset>
512 <      </batchtest>
513 <
514 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
515 <        <fileset dir="${test.src.dir}">
516 <          <include name="jsr166/test/**/${testcase}Test.java"/>
517 <        </fileset>
518 <      </batchtest>
519 <
520 < <!--
521 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
442 <        <fileset dir="${jtreg.src.dir}">
443 <          <include name="**/${testcase}Test.java"/>
444 <        </fileset>
445 <      </batchtest>
446 < -->
447 <
448 <    </junit>
449 <
484 >    <run-tck-tests
485 >      target="${java.runtime.target}"
486 >      workdir="${build.dir}"
487 >      classes="${product.jar}">
488 >      <javac-elements>
489 >        <compilerarg value="-Werror"/>
490 >      </javac-elements>
491 >    </run-tck-tests>
492 >  </target>
493 >
494 >  <target name="tck-parallelism-1"
495 >          description="Runs tck with common pool parallelism 1">
496 >    <antcall target="tck">
497 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
498 >    </antcall>
499 >  </target>
500 >
501 >  <target name="tck-parallelism-0"
502 >          description="Runs tck with common pool parallelism 0">
503 >    <antcall target="tck">
504 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
505 >    </antcall>
506 >  </target>
507 >
508 >  <target name="tck-security-manager"
509 >          description="Runs tck with a security manager">
510 >    <antcall target="tck">
511 >      <param name="jsr166.useSecurityManager" value="true"/>
512 >    </antcall>
513 >  </target>
514 >
515 >  <target name="jtreg"
516 >          depends="jar"
517 >          description="Runs jtreg tests for src/main using the jtreg ant task">
518 >    <run-jtreg-tests
519 >       target="${java.runtime.target}"
520 >       workdir="${build.dir}"
521 >       classes="${product.jar}"/>
522    </target>
523  
524 +  <target name="test"
525 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
526 +          description="Runs tck and jtreg tests for src/main"/>
527  
528 <  <target name="report-tests"
529 <          depends="run-tests">
530 <
531 <    <!-- Sets junit.report.format to frames if redirection is present,
532 <         otherwise sets it to noframes. -->
533 <    <available property="junit.report.format"
534 <                  value="frames"
535 <              classname="org.apache.xalan.lib.Redirect"
536 <    />
537 <    <property name="junit.report.format" value="noframes"/>
538 <
539 <    <junitreport todir="${build.reports.dir}">
540 <      <fileset dir="${build.reports.dir}">
541 <        <include name="TEST-*.xml"/>
542 <      </fileset>
543 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
544 <      />
545 <    </junitreport>
546 <
547 <    <fail message="Test Cases Failed" if="junit.failed"/>
548 <
528 >  <target name="test-version-permutations"
529 >          depends="test11, test12, test13, test14, test15, test16,
530 >          test11-12, test11-13, test11-14, test11-15, test11-16,
531 >          clean, test, docs"
532 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
533 >
534 >  <target name="test11">
535 >    <antcall>
536 >      <param name="java.runtime.target" value="11"/>
537 >      <param name="build.main.javac" value="${javac11}"/>
538 >      <param name="build.main.javadoc" value="${javadoc12}"/>
539 >      <param name="build.main.javadoc.source" value="11"/>
540 >      <target name="clean"/>
541 >      <target name="test"/>
542 >      <target name="docs"/>
543 >    </antcall>
544 >  </target>
545 >
546 >  <target name="test12">
547 >    <antcall>
548 >      <param name="java.runtime.target" value="12"/>
549 >      <param name="build.main.javac" value="${javac12}"/>
550 >      <param name="build.main.javadoc" value="${javadoc12}"/>
551 >      <param name="build.main.javadoc.source" value="12"/>
552 >      <target name="clean"/>
553 >      <target name="test"/>
554 >      <target name="docs"/>
555 >    </antcall>
556 >  </target>
557 >
558 >  <target name="test13">
559 >    <antcall>
560 >      <param name="java.runtime.target" value="13"/>
561 >      <param name="build.main.javac" value="${javac13}"/>
562 >      <param name="build.main.javadoc" value="${javadoc13}"/>
563 >      <param name="build.main.javadoc.source" value="13"/>
564 >      <target name="clean"/>
565 >      <target name="test"/>
566 >      <target name="docs"/>
567 >    </antcall>
568 >  </target>
569 >
570 >  <target name="test14">
571 >    <antcall>
572 >      <param name="java.runtime.target" value="14"/>
573 >      <param name="build.main.javac" value="${javac14}"/>
574 >      <param name="build.main.javadoc" value="${javadoc14}"/>
575 >      <param name="build.main.javadoc.source" value="14"/>
576 >      <target name="clean"/>
577 >      <target name="test"/>
578 >      <target name="docs"/>
579 >    </antcall>
580 >  </target>
581 >
582 >  <target name="test15">
583 >    <antcall>
584 >      <param name="java.runtime.target" value="15"/>
585 >      <param name="build.main.javac" value="${javac15}"/>
586 >      <param name="build.main.javadoc" value="${javadoc15}"/>
587 >      <param name="build.main.javadoc.source" value="15"/>
588 >      <target name="clean"/>
589 >      <target name="test"/>
590 >      <target name="docs"/>
591 >    </antcall>
592 >  </target>
593 >
594 >  <target name="test16">
595 >    <antcall>
596 >      <param name="java.runtime.target" value="16"/>
597 >      <param name="build.main.javac" value="${javac16}"/>
598 >      <param name="build.main.javadoc" value="${javadoc16}"/>
599 >      <param name="build.main.javadoc.source" value="16"/>
600 >      <target name="clean"/>
601 >      <target name="test"/>
602 >      <target name="docs"/>
603 >    </antcall>
604 >  </target>
605 >
606 >  <target name="test11-12">
607 >    <antcall>
608 >      <param name="java.runtime.target" value="12"/>
609 >      <param name="build.main.javac" value="${javac11}"/>
610 >      <param name="build.main.javadoc" value="${javadoc12}"/>
611 >      <param name="build.main.javadoc.source" value="11"/>
612 >      <target name="clean"/>
613 >      <target name="test"/>
614 >      <target name="docs"/>
615 >    </antcall>
616 >  </target>
617 >
618 >  <target name="test11-13">
619 >    <antcall>
620 >      <param name="java.runtime.target" value="13"/>
621 >      <param name="build.main.javac" value="${javac11}"/>
622 >      <param name="build.main.javadoc" value="${javadoc13}"/>
623 >      <param name="build.main.javadoc.source" value="11"/>
624 >      <target name="clean"/>
625 >      <target name="test"/>
626 >      <target name="docs"/>
627 >    </antcall>
628 >  </target>
629 >
630 >  <target name="test11-14">
631 >    <antcall>
632 >      <param name="java.runtime.target" value="14"/>
633 >      <param name="build.main.javac" value="${javac11}"/>
634 >      <param name="build.main.javadoc" value="${javadoc14}"/>
635 >      <param name="build.main.javadoc.source" value="11"/>
636 >      <target name="clean"/>
637 >      <target name="test"/>
638 >      <target name="docs"/>
639 >    </antcall>
640 >  </target>
641 >
642 >  <target name="test11-15">
643 >    <antcall>
644 >      <param name="java.runtime.target" value="15"/>
645 >      <param name="build.main.javac" value="${javac11}"/>
646 >      <param name="build.main.javadoc" value="${javadoc15}"/>
647 >      <param name="build.main.javadoc.source" value="11"/>
648 >      <target name="clean"/>
649 >      <target name="test"/>
650 >      <target name="docs"/>
651 >    </antcall>
652 >  </target>
653 >
654 >  <target name="test11-16">
655 >    <antcall>
656 >      <param name="java.runtime.target" value="16"/>
657 >      <param name="build.main.javac" value="${javac11}"/>
658 >      <param name="build.main.javadoc" value="${javadoc16}"/>
659 >      <param name="build.main.javadoc.source" value="11"/>
660 >      <target name="clean"/>
661 >      <target name="test"/>
662 >      <target name="docs"/>
663 >    </antcall>
664 >  </target>
665 >
666 >  <target name="docs16">
667 >    <antcall>
668 >      <param name="java.runtime.target" value="16"/>
669 >      <param name="build.main.javac" value="${javac16}"/>
670 >      <param name="build.main.javadoc" value="${javadoc16}"/>
671 >      <param name="build.main.javadoc.source" value="16"/>
672 >      <target name="clean"/>
673 >      <target name="docs"/>
674 >    </antcall>
675    </target>
676  
677  
678    <target name="configure-compiler">
679 +    <fail message="ant version too old">
680 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
681 +    </fail>
682  
683      <property name="unchecked.option" value="-Xlint:unchecked"/>
684  
# Line 491 | Line 695
695    </target>
696  
697  
698 <  <target name="configure-tests"
699 <       depends="configure-compiler">
698 >  <target name="compile-test-loops" depends="jar"
699 >          description="Compiles all the perf tests in src/test/loops">
700  
701 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
498 <    <available property="junit.available"
499 <               classname="junit.framework.Protectable"/>
701 >    <mkdir dir="${build.dir}/test/loops"/>
702  
703 <    <!-- Xalan -->
704 <    <available property="xalan.available"
503 <               classname="org.apache.xalan.Version"/>
504 <
505 <
506 <    <!-- Ant 1.6beta and later don't need or want this check -->
507 <    <!--
508 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
509 <          unless="junit.available"/>
510 <
511 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
512 <          unless="xalan.available"/>
513 <    -->
514 <
515 <  </target>
516 <
517 <
518 <  <!-- Various demos and test programs -->
519 <
520 <
521 <  <target name="loops" depends="configure-compiler"
522 <          description="Benchmark from Doug Lea's AQS paper">
523 <
524 <    <mkdir dir="${build.loops.dir}"/>
525 <
526 <    <javac srcdir="${loops.src.dir}"
527 <          destdir="${build.loops.dir}"
528 <            debug="${build.debug}"
529 <       debuglevel="${build.debuglevel}"
530 <      deprecation="${build.deprecation}"
531 <           source="${build.sourcelevel}"
532 <             fork="true">
533 <
534 <      <compilerarg line="${build.args}"/>
535 <      <classpath refid="loops.classpath"/>
536 <      <compilerarg value="-XDignore.symbol.file=true"/>
537 <
538 <    </javac>
539 <
540 <    <java classname="ALoops" fork="true">
541 <      <classpath refid="loops.classpath"/>
542 <    </java>
543 <
544 <  </target>
545 <
546 <
547 <  <!-- jsr166 4jdk7 -->
548 <
549 <
550 <  <target name="4jdk7compile"
551 <          depends="configure-compiler"
552 <          description="Compiles src/jdk7 sources, targeting jdk7">
553 <
554 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
555 <
556 <    <javac srcdir="${4jdk7src.dir}"
557 <           destdir="${build.4jdk7.classes.dir}"
703 >    <javac srcdir="${basedir}/src/test/loops"
704 >           destdir="${build.dir}/test/loops"
705             debug="${build.debug}"
706             debuglevel="${build.debuglevel}"
707             deprecation="${build.deprecation}"
561           source="6"
562           classpath=""
563           bootclasspath="${bootclasspath6}"
708             includeAntRuntime="false"
709             includeJavaRuntime="false"
710 <           executable="${javac7}"
710 >           encoding="ASCII"
711 >           executable="${build.main.javac}"
712             fork="true">
713  
714 <      <include name="**/*.java"/>
570 <      <compilerarg line="${build.args}"/>
714 >      <include name="*.java"/>
715        <compilerarg value="-XDignore.symbol.file=true"/>
716 <      <compilerarg value="-Xlint:all"/>
717 <
574 <    </javac>
575 <
576 <  </target>
577 <
578 <  <target name="4jdk7-jar"
579 <          depends="4jdk7compile"
580 <          description="Builds library jar from compiled sources">
581 <
582 <    <jar destfile="${4jdk7product.jar}">
583 <      <fileset dir="${build.4jdk7.classes.dir}"/>
584 <    </jar>
585 <
586 <  </target>
587 <
588 <
589 <  <target name="4jdk7-test-tck"
590 <          depends="4jdk7-jar"
591 <          description="Runs tck tests for jsr166-4jdk7 directly">
592 <
593 <    <run-tck-tests
594 <      target="7"
595 <      workdir="${build.4jdk7.dir}"
596 <      product.jar="${4jdk7product.jar}"/>
597 <  </target>
598 <
599 <
600 <  <target name="4jdk7-test-tck-junit"
601 <          depends="4jdk7compile"
602 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
603 <
604 <    <junit printsummary="true"
605 <           showoutput="true"
606 <           errorProperty="junit.failed"
607 <           failureProperty="junit.failed"
608 <           includeantruntime="true"
609 <           jvm="${java7}"
610 <           fork="true">
611 <
612 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
613 <      <jvmarg value="-server"/>
614 <
615 <      <classpath>
616 <        <pathelement location="${junit.jar}"/>
617 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
618 <      </classpath>
619 <
620 <      <formatter type="brief"/>
621 <
622 <      <test name="JSR166TestCase" haltonfailure="no">
623 <      </test>
624 <
625 <    </junit>
626 <  </target>
627 <
628 <  <target name="4jdk7-test-jtreg"
629 <          depends="4jdk7compile"
630 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
631 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
632 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
633 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
634 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
635 <    <jtreg dir="${jtreg.src.dir}"
636 <           jdk="${jdk7.home}"
637 <           workDir="${build.4jdk7.dir}/JTwork"
638 <           reportDir="${build.4jdk7.dir}/JTreport">
639 <
640 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
641 <      <arg value="-agentvm"/>
642 <      <arg value="-v:nopass,fail"/>
643 <      <arg value="-vmoptions:-esa -ea"/>
644 <      <arg value="-automatic"/>
645 <      <arg value="-k:!ignore"/>
646 <    </jtreg>
647 <  </target>
648 <
649 <
650 <  <target name="4jdk7-test"
651 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
652 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
653 <  </target>
654 <
655 <
656 <  <target name="4jdk7docs"
657 <          description="Builds javadocs for src/jdk7 to dist dir">
658 <
659 <    <delete dir="${dist.4jdk7.docs.dir}"/>
660 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
661 <
662 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
663 <             packagenames="none"
664 <             link="${jdkapi7docs.url}"
665 <             overview="${4jdk7src.dir}/intro.html"
666 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
667 <             classpath=""
668 <             executable="${javadoc7}">
669 <      <arg value="-XDignore.symbol.file=true"/>
670 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
671 <        <include name="**/*.java"/>
672 <      </fileset>
673 <    </javadoc>
674 <
675 <  </target>
676 <
677 <
678 <  <target name="4jdk7dist"
679 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
680 <          description="Puts all distributable products in single hierarchy"/>
681 <
682 <
683 <
684 <  <target name="4jdk7clean"
685 <          description="Removes all 4jdk7 build products">
686 <
687 <    <delete dir="${build.4jdk7.dir}"/>
688 <
689 <  </target>
690 <
691 <
692 <
693 <  <target name="4jdk7dist-clean"
694 <          description="Removes all build and distribution products">
695 <
696 <  </target>
697 <
698 <  <target name="4jdk7dist-jar"
699 <          depends="4jdk7clean, 4jdk7compile">
700 <
701 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
702 <
703 <  </target>
704 <
705 <
706 <  <!-- jsr166x -->
707 <
708 <  <target name="jsr166xcompile"
709 <          depends="configure-compiler"
710 <          description="Compiles jsr166x sources to build dir">
711 <
712 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
713 <
714 <    <javac srcdir="${topsrc.dir}"
715 <           destdir="${build.jsr166x.classes.dir}"
716 <           debug="${build.debug}"
717 <           debuglevel="${build.debuglevel}"
718 <           deprecation="${build.deprecation}"
719 <           classpath=""
720 <           source="5"
721 <           bootclasspath="${bootclasspath6}"
722 <           includeAntRuntime="false"
723 <           includeJavaRuntime="false"
724 <           executable="${javac7}"
725 <           fork="true">
726 <
727 <      <include name="jsr166x/**/*.java"/>
716 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
717 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
718        <compilerarg line="${build.args}"/>
729      <compilerarg value="-XDignore.symbol.file=true"/>
730      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
731
719      </javac>
733
720    </target>
721  
722  
723 +  <!-- old branches no longer maintained.  build support deleted -->
724 +  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
725 +  <!-- jsr166 4jdk7 (no longer maintained) -->
726 +  <!-- jsr166x (no longer maintained) -->
727 +  <!-- jsr166y (no longer maintained) -->
728 +  <!-- extra166y (no longer maintained) -->
729 +  <!-- jsr166e (no longer maintained) -->
730  
731 <  <target name="jsr166xjar"
739 <          depends="jsr166xcompile"
740 <          description="Builds library jar from compiled sources">
731 > <!-- Find buglets that can be detected by static build tools -->
732  
733 <    <jar destfile="${jsr166x.jar}">
734 <      <fileset dir="${build.jsr166x.classes.dir}"/>
735 <    </jar>
733 > <!--   <target name="lint"> -->
734 > <!--     <antcall target="dists"> -->
735 > <!--       <param name="build.javadoc.access" value="protected"/> -->
736 > <!--     </antcall> -->
737 > <!--   </target> -->
738  
739 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
740 +  <target name="doclint-private">
741 +    <antcall target="dist">
742 +      <param name="build.javadoc.access" value="private"/>
743 +    </antcall>
744    </target>
745  
746  
747 + <!-- ==============================================================
748 +  Experimental errorprone support
749 +  https://errorprone.info
750 +  https://errorprone.info/docs/installation
751 +  https://github.com/google/error-prone/issues/1143
752 + =================================================================== -->
753 +  <path id="errorprone.processorpath.path">
754 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
755 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
756 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
757 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
758 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
759 +  </path>
760 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
761 +  <property name="errorprone.jsr166.user.flags" value=""/>
762 +  <property name="errorprone.jsr166.flags"
763 +            value="-Xep:HashtableContains:OFF
764 +                   -Xep:PreferJavaTimeOverload:OFF
765 +                   -Xep:JdkObsolete:OFF
766 +                   -Xep:MissingOverride:OFF
767 +                   -Xep:MissingFail:OFF
768 +                   -Xep:ThreadPriorityCheck:OFF
769 +                   -Xep:MixedArrayDimensions:ERROR
770 +                   -Xep:RemoveUnusedImports:ERROR
771 +                   -Xep:EmptyIf:ERROR
772 +                   -Xep:MultipleTopLevelClasses:ERROR
773 +                   -Xep:ClassName:ERROR
774 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
775 +                   -Xep:RedundantThrows:ERROR
776 +                   -Xep:IdentityBinaryExpression:WARN
777 +                   -Xep:ConstructorInvokesOverridable:WARN
778 +                   -Xep:MethodCanBeStatic:WARN
779 +                   ${errorprone.jsr166.user.flags}"/>
780 +  <!-- -Xep:WildcardImport:ERROR -->
781 +  <property name="errorprone.jsr166.test.flags"
782 +            value="-Xep:StringSplitter:OFF
783 +                   -Xep:BoxedPrimitiveConstructor:OFF
784 +                   -Xep:UnnecessaryParentheses:OFF
785 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
786 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
787 +  <target name="errorprone"
788 +          depends="clean, configure-compiler"
789 +          description="Run errorprone over jsr166 source code (experimental)">
790 +
791 +    <local name="destdir"/>
792 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
793 +    <mkdir dir="${destdir}"/>
794  
795 <  <target name="jsr166xdocs"
796 <          description="Builds javadocs to dist dir">
752 <
753 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
754 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
755 <
756 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
757 <             packagenames="jsr166x.*"
758 <             link="${jdkapidocs.url}"
759 <             source="5"
760 <             bootclasspath="${bootclasspath6}"
761 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
762 <             executable="${javadoc7}"
763 <             additionalparam="-XDignore.symbol.file=true"/>
764 <
765 <  </target>
766 <
767 <
768 <  <target name="jsr166xdist"
769 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
770 <          description="Puts all distributable products in single hierarchy"/>
771 <
772 <
773 <
774 <  <target name="jsr166xclean"
775 <          description="Removes all jsr166x build products">
776 <
777 <    <delete dir="${build.jsr166x.dir}"/>
778 <
779 <  </target>
780 <
781 <
782 <
783 <  <target name="jsr166xdist-clean"
784 <          description="Removes all build and distribution products">
785 <
786 <  </target>
787 <
788 <
789 <  <target name="jsr166xdist-jar"
790 <          depends="jsr166xclean, jsr166xjar">
791 <
792 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
793 <
794 <  </target>
795 <
796 <  <!-- jsr166y -->
797 <
798 <
799 <  <target name="jsr166ycompile"
800 <          depends="configure-compiler"
801 <          description="Compiles jsr166y sources">
802 <
803 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
804 <
805 <    <javac srcdir="${topsrc.dir}"
806 <           destdir="${build.jsr166y.classes.dir}"
795 >    <javac srcdir="${src.dir}"
796 >           destdir="${destdir}"
797             debug="${build.debug}"
798             debuglevel="${build.debuglevel}"
799             deprecation="${build.deprecation}"
810           source="6"
800             classpath=""
812           bootclasspath="${bootclasspath6}"
801             includeAntRuntime="false"
802             includeJavaRuntime="false"
803 <           executable="${javac7}"
803 >           encoding="ASCII"
804 >           executable="${build.main.javac}"
805             fork="true">
806  
807 <      <include name="jsr166y/**/*.java"/>
808 <      <compilerarg line="${build.args}"/>
807 >      <include name="**/*.java"/>
808 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
809 >      <compilerarg value="-J--illegal-access=permit"/>
810 >      <compilerarg value="-XDcompilePolicy=simple"/>
811 >      <compilerarg value="-processorpath"/>
812 >      <compilerarg pathref="errorprone.processorpath.path"/>
813 >      <compilerarg value="-Xplugin:ErrorProne
814 >                          ${errorprone.jsr166.flags}"/>
815 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
816 >      <compilerarg value="-Xprefer:source"/>
817        <compilerarg value="-XDignore.symbol.file=true"/>
818        <compilerarg value="-Xlint:all"/>
819 <    </javac>
820 <  </target>
824 <
825 <
826 <  <target name="jsr166yjar"
827 <          depends="jsr166ycompile"
828 <          description="Builds library jar from compiled sources">
829 <
830 <    <jar destfile="${jsr166y.jar}" index="true">
831 <      <fileset dir="${build.jsr166y.classes.dir}"/>
832 <    </jar>
833 <
834 <  </target>
835 <
836 <
837 <
838 <  <target name="jsr166ydocs"
839 <          description="Builds javadocs to dist dir">
840 <
841 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
842 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
843 <
844 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
845 <             packagenames="jsr166y.*"
846 <             link="${jdkapidocs.url}"
847 <             source="6"
848 <             bootclasspath="${bootclasspath6}"
849 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
850 <             executable="${javadoc7}"
851 <             additionalparam="-XDignore.symbol.file=true"/>
852 <
853 <  </target>
854 <
855 <
856 <  <target name="jsr166ydist"
857 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
858 <          description="Puts all distributable products in single hierarchy"/>
859 <
860 <
861 <
862 <  <target name="jsr166yclean"
863 <          description="Removes all jsr166y build products">
864 <
865 <    <delete dir="${build.jsr166y.dir}"/>
866 <
867 <  </target>
868 <
869 <
870 <
871 <  <target name="jsr166ydist-clean"
872 <          description="Removes all build and distribution products">
873 <
874 <  </target>
875 <
876 <  <target name="jsr166ydist-jar"
877 <          depends="jsr166yclean, jsr166yjar">
878 <
879 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
880 <
881 <  </target>
882 <
883 <
884 <  <!-- extra166y -->
885 <
886 <
887 <  <target name="extra166ycompile"
888 <          depends="configure-compiler, jsr166yjar"
889 <          description="Compiles extra166y sources">
890 <
891 <    <mkdir dir="${build.extra166y.classes.dir}"/>
892 <
893 <    <javac srcdir="${topsrc.dir}"
894 <           destdir="${build.extra166y.classes.dir}"
895 <           debug="${build.debug}"
896 <           debuglevel="${build.debuglevel}"
897 <           deprecation="${build.deprecation}"
898 <           classpath=""
899 <           source="6"
900 <           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
901 <           includeAntRuntime="false"
902 <           includeJavaRuntime="false"
903 <           executable="${javac7}"
904 <           fork="true">
905 <
906 <      <include name="extra166y/**/*.java"/>
907 <      <compilerarg line="${build.args}"/>
908 <      <compilerarg value="-XDignore.symbol.file=true"/>
909 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
910 <
911 <    </javac>
912 <
913 <  </target>
914 <
915 <
916 <
917 <  <target name="extra166yjar"
918 <          depends="extra166ycompile"
919 <          description="Builds library jar from compiled sources">
920 <
921 <    <jar destfile="${extra166y.jar}" index="true">
922 <      <fileset dir="${build.extra166y.classes.dir}"/>
923 <    </jar>
924 <
925 <  </target>
926 <
927 <
928 <
929 <  <target name="extra166ydocs"
930 <          description="Builds javadocs to build dir">
931 <
932 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
933 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
934 <
935 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
936 <             packagenames="extra166y.*"
937 <             link="${jdkapidocs.url}"
938 <             source="6"
939 <             bootclasspath="${bootclasspath6}"
940 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
941 <             executable="${javadoc7}"
942 <             additionalparam="-XDignore.symbol.file=true"/>
943 <
944 <  </target>
945 <
946 <
947 <  <target name="extra166ydist"
948 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
949 <          description="Puts all distributable products in single hierarchy"/>
950 <
951 <
952 <
953 <  <target name="extra166yclean"
954 <          description="Removes all extra166y build products">
955 <
956 <    <delete dir="${build.extra166y.dir}"/>
957 <
958 <  </target>
959 <
960 <
961 <
962 <  <target name="extra166ydist-clean"
963 <          description="Removes all build and distribution products">
964 <
965 <  </target>
966 <
967 <  <target name="extra166ydist-jar"
968 <          depends="extra166yclean, extra166yjar">
969 <
970 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
971 <
972 <  </target>
973 <
974 <  <!-- jsr166e -->
975 <
976 <  <target name="jsr166ecompile"
977 <          depends="configure-compiler"
978 <          description="Compiles jsr166e sources">
979 <
980 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
981 <
982 <    <javac srcdir="${topsrc.dir}"
983 <           destdir="${build.jsr166e.classes.dir}"
984 <           debug="${build.debug}"
985 <           debuglevel="${build.debuglevel}"
986 <           deprecation="${build.deprecation}"
987 <           source="7"
988 <           classpath=""
989 <           includeAntRuntime="false"
990 <           includeJavaRuntime="false"
991 <           executable="${javac7}"
992 <           fork="true">
993 <
994 <      <include name="jsr166e/**/*.java"/>
819 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
820 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
821        <compilerarg line="${build.args}"/>
996      <compilerarg value="-XDignore.symbol.file=true"/>
997      <compilerarg value="-Xlint:all"/>
998
822      </javac>
823  
824 <  </target>
825 <
1003 <
1004 <
1005 <  <target name="jsr166ejar"
1006 <          depends="jsr166ecompile"
1007 <          description="Builds library jar from compiled sources">
1008 <
1009 <    <jar destfile="${jsr166e.jar}" index="true">
1010 <      <fileset dir="${build.jsr166e.classes.dir}"/>
824 >    <jar destfile="${product.jar}">
825 >      <fileset dir="${destdir}"/>
826      </jar>
827  
828 <  </target>
829 <
830 <
831 <
832 <  <target name="jsr166edocs"
833 <          description="Builds javadocs to build dir">
834 <
835 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
836 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
837 <
838 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
839 <             packagenames="jsr166e.*"
840 <             link="${jdkapidocs.url}"
841 <             source="7"
842 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
843 <             executable="${javadoc7}"
844 <             additionalparam="-XDignore.symbol.file=true" >
845 <    </javadoc>
846 <
847 <  </target>
848 <
849 <
850 <  <target name="jsr166edist"
851 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
852 <          description="Puts all distributable products in single hierarchy"/>
853 <
854 <
855 <
856 <  <target name="jsr166eclean"
857 <          description="Removes all jsr166e build products">
858 <
859 <    <delete dir="${build.jsr166e.dir}"/>
860 <
861 <  </target>
862 <
863 <
864 <  <target name="jsr166edist-clean"
865 <          description="Removes all build and distribution products">
866 <
867 <  </target>
868 <
869 <  <target name="jsr166edist-jar"
870 <          depends="jsr166eclean, jsr166ejar">
871 <
872 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
828 >    <run-tck-tests
829 >      target="${java.runtime.target}"
830 >      workdir="${build.dir}"
831 >      classes="${product.jar}">
832 >      <javac-elements>
833 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
834 >        <compilerarg value="-J--illegal-access=permit"/>
835 >        <compilerarg value="-XDcompilePolicy=simple"/>
836 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
837 >        <compilerarg value="-Xplugin:ErrorProne
838 >                            ${errorprone.jsr166.flags}
839 >                            ${errorprone.jsr166.test.flags}"/>
840 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
841 >      </javac-elements>
842 >    </run-tck-tests>
843 >  </target>
844 >
845 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
846 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
847 >  <target name="errorprone-jtreg"
848 >          depends="jar"
849 >          description="Run errorprone over jtreg tests (experimental)">
850 >
851 >    <run-jtreg-tests
852 >       target="${java.runtime.target}"
853 >       workdir="${build.dir}"
854 >       classes="${product.jar}"
855 >       verbose="all">
856 >      <jtreg-elements>
857 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
858 >        <arg value="-javacoption:-processorpath"/>
859 >        <arg value="-javacoption:${errorprone.processorpath}"/>
860 >        <arg value="-javacoption:-Xplugin:ErrorProne
861 >                            ${errorprone.jsr166.flags}
862 >                            ${errorprone.jsr166.test.flags}
863 >                            -Xep:MultipleTopLevelClasses:WARN
864 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
865 >      </jtreg-elements>
866 >    </run-jtreg-tests>
867 >  </target>
868 >
869 >
870 > <!-- ==============================================================
871 >  Running guava tests against jsr166 code
872 > =================================================================== -->
873 >
874 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
875 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
876 > <!-- <property name="guava.version" value="21.0"/> -->
877 >
878 > <!-- HOWTO debug print a path id -->
879 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
880 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
881 >
882 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
883 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
884 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
885 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
886 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
887 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
888 >
889 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
890 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
891 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
892 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
893 >
894 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
895 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
896 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
897 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
898 >
899 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
900 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
901 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
902 >
903 >  <target name="init-ivy">
904 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
905 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
906 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
907 >             classpath="${build.dir}/ivy.jar"/>
908 >  </target>
909 >
910 >  <target name="guava-tests" depends="jar, init-ivy"
911 >          description="Guava tests run against jsr166 collections">
912 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
913 >    <mkdir dir="${guava.dir}"/>
914 >    <ivy:retrieve pathid="guava.testlib.classpath"
915 >      type="jar,bundle" inline="true" conf="default,master"
916 >      pattern="${guava.dir}/[artifact].[ext]"
917 >      organisation="com.google.guava" module="guava-testlib"/>
918 >    <property name="guava.version" value="21.0"/>
919 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
920 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
921 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
922 >           jvm="${build.main.java}" fork="true">
923 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
924 >      <formatter type="brief"/>
925 >      <classpath>
926 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
927 >        <path refid="guava.testlib.classpath"/>
928 >      </classpath>
929  
930 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
931 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
932 +    </junit>
933    </target>
934  
935   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines