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.23 by tim, Sat May 17 21:20:50 2003 UTC vs.
Revision 1.325 by dl, Tue Mar 22 21:28:02 2022 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 <    Build file for JSR-166
7 > ------------------------------------------------------------------------------
8 >  Build file for JSR-166
9  
10 <    JUnit 1.8 must be in ${ant.home}/lib for the test target to work.
11 <  </description>
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 +
18 +  The repository contains all dependencies except for ant and the JDK
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/jdk17
23 +  $HOME/jdk/jdk19
24 +  where each of the above is a JDK or a symlink to same, and
25 +  $HOME/jdk/src/jdk17
26 +  where each of the above is a JDK source tree or a symlink to same.
27 +
28 +  Alternatively, define ant variables thus:
29 +  ant -Djdk$N.home=... -Djdk$N.src.home=...
30 +  for $N in 17 .. 19 ...
31 +
32 +  As of 2016-03, the sources in src/main are for jdk9+ only.
33 +  As of 2019-08, the sources in src/main are for jdk11+ only.
34 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
35 +  As of 2022-02, the sources in src/main are for jdk17+ only.
36 + ------------------------------------------------------------------------------
37 +  </description>
38  
39 <  <target name="usage" description="Prints this message">
40 <    <echo>
41 < ant [target], where target is one of:
42 <
43 < usage       (default) Prints this message
15 < compile     Compiles all sources to build folder
16 < jar         Builds library jar from compiled sources
17 < test        Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)
18 < docs        Builds javadocs with custom tags to build folder
19 < dist-docs   Builds javadocs without custom tags to dist folder
20 < dist        Puts all distributable products in single hierarchy
21 <
22 < clean       Removes all build products
23 < dist-clean  Removes all build and distribution products
24 <
25 < checkstyle  Reports on style errors in Java source (verbose, mostly chaff)
26 < doccheck    Reports on javadoc style errors (not working yet)
27 <    </echo>
39 >  <!-- Run 'ant -projecthelp' (default target) -->
40 >  <target name="usage">
41 >    <java classname="org.apache.tools.ant.Main">
42 >      <arg value="-projecthelp" />
43 >    </java>
44    </target>
45  
46 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
47 +
48 +  <!-- User-specific settings -->
49    <property file="user.properties"/>
50 <  <property name="testcase" value="*"/>
50 >
51  
52    <!-- Compilation options -->
34  <property name="build.sourcelevel"    value="1.5"/>
53    <property name="build.debug"          value="true"/>
54    <property name="build.debuglevel"     value="source,lines,vars"/>
55    <property name="build.deprecation"    value="false"/>
56 <  <!--
39 <  <property name="build.warnings"       value="true"/>
40 <  -->
56 >  <property name="build.javadoc.access" value="protected"/>
57  
58    <!-- Build locations -->
59 <  <property name="build.dir"            location="build"/>
60 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
61 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
62 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
63 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
64 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
65 <  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
66 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
67 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
68 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
59 >  <property name="build.dir"                   location="build"/>
60 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
61 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
63 >
64 >  <!-- JDK locations -->
65 >  <property name="jdks.home"  location="${user.home}/jdk"/>
66 >
67 >  <macrodef name="defjdklocations">
68 >    <attribute name="v"/>
69 >    <sequential>
70 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
71 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
72 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
73 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
74 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
75 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
76 >    </sequential>
77 >  </macrodef>
78 >
79 >  <macrodef name="mirror-dir">
80 >    <attribute name="src"/>
81 >    <attribute name="dst"/>
82 >    <sequential>
83 >    <delete dir="@{dst}"/>
84 >    <mkdir dir="@{dst}"/>
85 >    <copy todir="@{dst}" preservelastmodified="true">
86 >      <fileset dir="@{src}"/>
87 >    </copy>
88 >    </sequential>
89 >  </macrodef>
90 >
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94  
95    <!-- Source locations -->
96    <property name="src.dir"              location="${basedir}/src/main"/>
97    <property name="test.src.dir"         location="${basedir}/src/test"/>
98 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
99 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
98 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
99 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
100 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
101 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
102 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
104    <property name="lib.dir"              location="${basedir}/lib"/>
105    <property name="dist.dir"             location="${basedir}/dist"/>
106 +  <property name="topsrc.dir"           location="${basedir}/src"/>
107  
108 <  <!-- Distribution locations -->
109 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
108 >  <!-- Javadoc locations -->
109 >  <property name="docs.dir"          location="${build.dir}/docs"/>
110 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
111  
112    <!-- Jar locations -->
113 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
114 <  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
68 <  <property name="collect.jar"          location="${lib.dir}/collect.jar"/>
69 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
70 <  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
71 <
72 <  <property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
73 <
74 <  <path id="javac.bootclasspath">
75 <    <pathelement location="${collect.jar}"/>
76 <    <pathelement location="${rt.jar}"/>
77 <  </path>
113 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
114 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
115  
116 <  <path id="test.classpath">
117 <    <pathelement location="${product.jar}"/>
118 <  </path>
119 <
120 <
121 <  <!-- Main targets -->
122 <
123 <  <target name="compile" depends="init"
124 <          description="Compiles all sources to build folder">
125 <    <mkdir dir="${build.classes.dir}"/>
126 <    <javac srcdir="${src.dir}"
127 <          destdir="${build.classes.dir}"
128 <            debug="${build.debug}"
129 <       debuglevel="${build.debuglevel}"
130 <      deprecation="${build.deprecation}"
131 <           source="${build.sourcelevel}"
132 <             fork="true">
133 <
134 <      <bootclasspath refid="javac.bootclasspath"/>
135 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
116 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
117 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
118 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
119 >  <property name="java18.docroot.url" value="https://download.java.net/java/early_access/jdk18/docs"/>
120 >  <property name="java19.docroot.url" value="https://download.java.net/java/early_access/jdk19/docs"/>
121 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
122 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
123 >
124 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
125 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
126 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
127 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
128 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
129 >
130 >  <!-- Define the "jtreg" task -->
131 >  <!-- See the docs in "jtreg -onlineHelp" -->
132 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
133 >           classpath="${lib.dir}/jtreg.jar" />
134 >
135 >  <!-- Tck configuration options; see JSR166TestCase.java
136 >   To profile a single tck test class:
137 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
138 >   To stress test a single tck test class:
139 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
140 >   To stress test a single tck test method:
141 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
142 >  -->
143 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
144 >  <macrodef name="run-tck-tests">
145 >    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
146 >    <attribute name="target"/>
147 >    <attribute name="compile-target" default="@{target}"/>
148 >    <attribute name="workdir"/>
149 >    <attribute name="classes"/>
150 >    <!--
151 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
152 >    -->
153 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
154 >    <element name="javac-elements" optional="true"/>
155 >
156 >    <sequential>
157 >
158 >    <mkdir dir="@{workdir}/tck-classes"/>
159 >
160 >    <javac srcdir="@{tck.src.dir}"
161 >           destdir="@{workdir}/tck-classes"
162 >           debug="${build.debug}"
163 >           debuglevel="${build.debuglevel}"
164 >           deprecation="${build.deprecation}"
165 >           source="@{compile-target}"
166 >           target="@{compile-target}"
167 >           classpath="${junit.jar}"
168 >           includeAntRuntime="false"
169 >           includeJavaRuntime="false"
170 >           encoding="ASCII"
171 >           executable="${javac@{compile-target}}"
172 >           fork="true">
173 >
174 >      <include name="*.java"/>
175 >      <compilerarg value="-XDignore.symbol.file=true"/>
176 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
177 >      <compilerarg value="-Xdoclint:reference/private"/>
178 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
179 >      <compilerarg line="${build.args}"/>
180 >      <javac-elements/>
181  
182      </javac>
101  </target>
102
183  
184 <  <target name="jar" depends="compile"
185 <          description="Builds library jar from compiled sources">
186 <    <mkdir dir="${build.lib.dir}"/>
187 <    <jar basedir="${build.classes.dir}"
188 <        destfile="${product.jar}"
189 <    />
190 <  </target>
184 >    <java classname="${jsr166.tckTestClass}"
185 >          failonerror="true"
186 >          jvm="${java@{target}}"
187 >          fork="true">
188 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
189 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
190 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
191 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
192 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
193 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
194 >        <jvmarg line="@{jvmflags}"/>
195 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
196 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
197 >
198 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
199 >        <syspropertyset id="system-properties-used-by-tck">
200 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
201 >          <propertyref prefix="jsr166."/>
202 >          <propertyref name="test.timeout.factor"/>
203 >        </syspropertyset>
204 >
205 >        <classpath>
206 >          <pathelement location="${junit.jar}"/>
207 >          <pathelement location="@{workdir}/tck-classes"/>
208 >        </classpath>
209 >    </java>
210 >
211 >    </sequential>
212 >  </macrodef>
213 >
214 >  <!-- Define jtreg test sets for different jdk versions -->
215 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
216 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
217 >  <property name="jtreg.test.pattern" value="**/*.java"/>
218 >  <macrodef name="defjtregtests">
219 >    <attribute name="v"/>
220 >    <sequential>
221 >      <fileset dir="${jtreg@{v}.src.dir}">
222 >        <patternset id="jdk@{v}.jtreg.tests">
223 >          <include name="${jtreg.test.pattern}"/>
224 >        </patternset>
225 >      </fileset>
226 >    </sequential>
227 >  </macrodef>
228  
229 +  <defjtregtests v="19"/>
230 +  <defjtregtests v="17"/>
231 +  <defjtregtests v="17"/>
232 +
233 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
234 +  <property name="jtreg.flags" value=""/>
235 +
236 +  <macrodef name="run-jtreg-tests">
237 +    <attribute name="target"/>
238 +    <attribute name="workdir"/>
239 +    <attribute name="classes"/>
240 +    <attribute name="verbose" default="${jtreg.verbose}"/>
241 +    <attribute name="jtregflags" default=""/>
242 +    <element name="jtreg-elements" optional="true"/>
243 +
244 +    <sequential>
245 +
246 +    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
247 +    <property name="jtreg.verbose" value="nopass,fail,error"/>
248 +
249 +    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
250 +    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
251 +    <!-- In 2020 concurrency:3 seems like a sweet spot -->
252 +    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
253 +    <property name="jtreg.concurrency" value="3"/>
254 +
255 +    <delete dir="@{workdir}/JTwork" quiet="true"/>
256 +    <jtreg dir="${jtreg@{target}.src.dir}"
257 +           jdk="${jdk@{target}.home}"
258 +           workDir="@{workdir}/JTwork">
259 +      <patternset refid="jdk@{target}.jtreg.tests"/>
260 +      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
261 +      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
262 +      <arg value="-vmoption:-Xmx256m"/>
263 +      <arg value="-concurrency:${jtreg.concurrency}"/>
264 +      <arg value="-vmoptions:-esa -ea"/>
265 +      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
266 +      <arg value="-agentvm"/>
267 +      <arg value="-noreport"/>
268 +      <arg value="-verbose:@{verbose}"/>
269 +      <arg value="-automatic"/>
270 +      <arg value="-k:!ignore"/>
271 +      <arg line="@{jtregflags}"/>
272 +      <arg line="${jtreg.flags}"/>
273 +      <jtreg-elements/>
274 +    </jtreg>
275 +    </sequential>
276 +  </macrodef>
277 +
278 +  <!-- ALoops classpath -->
279 +  <path id="loops.classpath">
280 +    <pathelement location="${build.loops.dir}"/>
281 +  </path>
282  
283 <  <target name="test" depends="init, check-junit, report-tests"
284 <          description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
283 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
284 >  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
285 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
286 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
287  
288 +  <!-- Main targets -->
289  
290 <  <target name="checkstyle" depends="filter-src"
291 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
292 <    <taskdef resource="checkstyletask.properties"
293 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
290 >  <!-- Default values: may seem strange ... -->
291 >  <!-- At runtime, target latest, but build for current LTS -->
292 >  <property name="java.runtime.target" value="19"/>
293 >  <property name="build.main.java" value="${java17}"/>
294 >  <property name="build.main.javac" value="${javac17}"/>
295 >  <property name="build.main.javadoc" value="${javadoc19}"/>
296 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
297 >
298 >  <target name="dists"
299 >          depends="dist"
300 >          description="Builds all public jars and docs"/>
301 >
302 >  <target name="compile"
303 >          depends="configure-compiler"
304 >          description="Compiles src/main sources to build dir">
305  
306 <    <checkstyle>
307 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
124 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
125 <    </checkstyle>
126 <  </target>
306 >    <local name="destdir"/>
307 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
308  
309 +    <mkdir dir="${destdir}"/>
310  
311 <  <target name="doccheck" depends="filter-src"
312 <          description="Reports on javadoc style errors (not working yet)">
313 <    <delete dir="${build.doccheck.dir}"/>
314 <    <mkdir dir="${build.doccheck.dir}"/>
315 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
316 <         docletpath="${lib.dir}/doccheck.jar"
317 <            destdir="${build.doccheck.dir}">
318 <      <packageset dir="${build.filter.src.dir}"/>
319 <    </javadoc>
311 >    <javac srcdir="${src.dir}"
312 >           destdir="${destdir}"
313 >           debug="${build.debug}"
314 >           debuglevel="${build.debuglevel}"
315 >           deprecation="${build.deprecation}"
316 >           classpath=""
317 >           includeAntRuntime="false"
318 >           includeJavaRuntime="false"
319 >           encoding="ASCII"
320 >           executable="${build.main.javac}"
321 >           fork="true">
322 >
323 >      <include name="**/*.java"/>
324 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
325 >      <compilerarg value="-Xprefer:source"/>
326 >      <compilerarg value="-XDignore.symbol.file=true"/>
327 >      <compilerarg value="-Xlint:all"/>
328 >      <compilerarg value="-Xdoclint:all/protected"/>
329 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
330 >      <compilerarg value="-Werror"/>
331 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
332 >      <compilerarg line="${build.args}"/>
333 >    </javac>
334    </target>
335  
336 <
337 <  <target name="docs" depends="filter-src"
338 <          description="Builds javadocs with custom tags to build folder">
339 <    <delete dir="${build.javadocs.dir}"/>
340 <    <mkdir dir="${build.javadocs.dir}"/>
341 <    <javadoc destdir="${build.javadocs.dir}"
342 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
343 <            overview="${src.dir}/intro.html"
344 <              source="${build.sourcelevel}">
345 <
346 <      <tag name="revised" description="Last revised:"/>
347 <      <tag name="spec" description="Specified by:"/>
152 <      <tag name="editor" description="Last edited by:"/>
153 <      <tag name="fixme" description="FIX ME:"/>
154 <      <packageset dir="${build.filter.src.dir}"/>
155 <
156 <    </javadoc>
336 >  <target name="jar"
337 >          depends="compile"
338 >          description="Builds library jar for src/main from compiled sources">
339 >    <local name="subdir"/>
340 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
341 >    <jar destfile="${product.jar}">
342 >      <fileset dir="${build.classes.dir}${subdir}"/>
343 >      <manifest>
344 >        <attribute name="Built-By" value="${user.name}"/>
345 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
346 >      </manifest>
347 >    </jar>
348    </target>
349  
350  
351 <  <!--
352 <   # javac -s doesn't reliably generate compilable code. It generates
353 <   # bridge methods (marked as "synthetic") that can have identical
354 <   # signatures to existing methods except for the return value.
355 <   -->
356 <  <target name="strip" depends="init">
357 <    <mkdir dir="${build.stripped.dir}"/>
358 <    <javac srcdir="${src.dir}"
359 <          destdir="${build.stripped.dir}"
360 <            debug="${build.debug}"
361 <       debuglevel="${build.debuglevel}"
362 <      deprecation="${build.deprecation}"
363 <           source="${build.sourcelevel}"
364 <             fork="true">
365 <
366 <      <bootclasspath refid="javac.bootclasspath"/>
367 <      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
368 <
369 <    </javac>
351 >  <target name="docs"
352 >          description="Builds javadocs for src/main to dist dir">
353 >    <delete dir="${docs.dir}" quiet="true"/>
354 >    <mkdir dir="${docs.dir}"/>
355 >    <javadoc destdir="${docs.dir}"
356 >             packagenames="none"
357 >             link="${java.api.url}"
358 >             overview="${src.dir}/intro.html"
359 >             access="${build.javadoc.access}"
360 >             sourcepath="${src.dir}"
361 >             classpath=""
362 >             source="${build.main.javadoc.source}"
363 >             executable="${build.main.javadoc}">
364 >      <fileset dir="${src.dir}" defaultexcludes="yes">
365 >        <include name="java/**/*.java"/>
366 >      </fileset>
367 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
368 >      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
369 >      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
370 >      <arg value="-quiet"/>
371 >      <arg value="-XDignore.symbol.file=true"/>
372 >      <arg value="-html5"/>
373 >      <arg value="-Xdoclint:all,-missing"/>
374 >      <arg value="--patch-module=java.base=${src.dir}"/>
375 >      <arg value="--frames" if:set="use-frames"/>
376 >      <arg value="--override-methods=summary"/>
377 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
378 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
379 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
380 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
381 >    </javadoc>
382    </target>
383  
384 <
385 <  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"
384 >  <target name="dist"
385 >          depends="dist-clean, dist-jar, dist-docs"
386            description="Puts all distributable products in single hierarchy"/>
387  
185
388    <target name="clean"
389            description="Removes all build products">
390      <delete dir="${build.dir}"/>
189    <delete dir="${build.classes.dir}"/>
190    <delete dir="${build.lib.dir}"/>
391    </target>
392  
193
393    <target name="dist-clean"
394            description="Removes all build and distribution products">
395 +    <delete dir="${build.dir}"/>
396      <delete dir="${dist.dir}"/>
397    </target>
398  
399 +  <target name="dist-jar"
400 +          depends="clean, jar">
401 +    <copy file="${product.jar}" todir="${dist.dir}"/>
402 +  </target>
403  
404 <  <!-- Anthill targets -->
404 >  <target name="dist-docs"
405 >          depends="clean, docs">
406 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
407 >  </target>
408  
409 <  <!-- Should really run the tests instead of just the jar target -->
410 <  <target name="anthill-build" depends="jar, docs, dist-docs"/>
409 >  <target name="tck"
410 >          depends="jar"
411 >          description="Runs tck tests for src/main directly">
412 >    <run-tck-tests
413 >      target="${java.runtime.target}"
414 >      workdir="${build.dir}"
415 >      classes="${product.jar}">
416 >      <javac-elements>
417 >        <!-- <compilerarg value="-Werror"/> -->
418 >      </javac-elements>
419 >    </run-tck-tests>
420 >  </target>
421  
422 <  <target name="anthill-publish">
423 <    <copy todir="${deployDir}/docs/private">
424 <      <fileset dir="${build.javadocs.dir}"/>
425 <    </copy>
426 <    <copy todir="${deployDir}/docs/public">
210 <      <fileset dir="${dist.javadocs.dir}"/>
211 <    </copy>
212 <    <copy tofile="${deployDir}/index.html"
213 <          file="${basedir}/etc/anthill-index.html"/>
214 <    <copy todir="${deployDir}/notes">
215 <      <fileset dir="${basedir}/etc/notes"/>
216 <    </copy>
422 >  <target name="tck-parallelism-1"
423 >          description="Runs tck with common pool parallelism 1">
424 >    <antcall target="tck">
425 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
426 >    </antcall>
427    </target>
428  
429 +  <target name="tck-parallelism-0"
430 +          description="Runs tck with common pool parallelism 0">
431 +    <antcall target="tck">
432 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
433 +    </antcall>
434 +  </target>
435  
436 <  <!-- Internal targets -->
436 >  <target name="tck-security-manager"
437 >          description="Runs tck with a security manager">
438 >    <antcall target="tck">
439 >      <param name="jsr166.useSecurityManager" value="true"/>
440 >    </antcall>
441 >  </target>
442  
443 <  <target name="set-warnings-if" if="build.warnings">
444 <    <property name="build.warnings.option" value="-warnunchecked"/>
443 >  <target name="jtreg"
444 >          depends="jar"
445 >          description="Runs jtreg tests for src/main using the jtreg ant task">
446 >    <run-jtreg-tests
447 >       target="${java.runtime.target}"
448 >       workdir="${build.dir}"
449 >       classes="${product.jar}"/>
450    </target>
451  
452 +  <target name="test"
453 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
454 +          description="Runs tck and jtreg tests for src/main"/>
455  
456 <  <target name="set-warnings-unless" unless="build.warnings">
457 <    <property name="build.warnings.option" value=""/>
458 <  </target>
456 >  <target name="test-version-permutations"
457 >          depends="test17, test19, clean, test, docs"
458 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
459  
460  
461 <  <target name="init" depends="set-warnings-if, set-warnings-unless">
462 <    <!-- Version is kept in a separate file -->
463 <    <loadfile property="version" srcFile="version.properties"/>
464 <    <echo>Building JSR-166 version ${version}</echo>
461 >  <target name="test17">
462 >    <antcall>
463 >      <param name="java.runtime.target" value="17"/>
464 >      <param name="build.main.javac" value="${javac17}"/>
465 >      <param name="build.main.javadoc" value="${javadoc17}"/>
466 >      <param name="build.main.javadoc.source" value="17"/>
467 >      <target name="clean"/>
468 >      <target name="test"/>
469 >      <target name="docs"/>
470 >    </antcall>
471 >  </target>
472 >  <target name="test19">
473 >    <antcall>
474 >      <param name="java.runtime.target" value="19"/>
475 >      <param name="build.main.javac" value="${javac19}"/>
476 >      <param name="build.main.javadoc" value="${javadoc19}"/>
477 >      <param name="build.main.javadoc.source" value="19"/>
478 >      <target name="clean"/>
479 >      <target name="test"/>
480 >      <target name="docs"/>
481 >    </antcall>
482    </target>
483  
484  
485 <  <target name="dist-jar" depends="clean, jar">
486 <    <copy file="${product.jar}" todir="${dist.dir}"/>
487 <  </target>
485 >  <target name="configure-compiler">
486 >    <fail message="ant version too old">
487 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
488 >    </fail>
489  
490 +    <property name="unchecked.option" value="-Xlint:unchecked"/>
491  
492 <  <target name="dist-docs" depends="filter-src"
493 <          description="Builds javadocs without custom tags to dist folder">
494 <    <delete dir="${dist.javadocs.dir}"/>
247 <    <mkdir dir="${dist.javadocs.dir}"/>
248 <    <javadoc destdir="${dist.javadocs.dir}"
249 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
250 <            overview="${src.dir}/intro.html"
251 <              source="${build.sourcelevel}">
492 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
493 >      <istrue value="${build.warnunchecked}"/>
494 >    </condition>
495  
496 <      <packageset dir="${build.filter.src.dir}"/>
496 >    <property name="warnunchecked.arg" value=""/>
497  
255    </javadoc>
256  </target>
498  
499 +    <!-- Common options in javac invocations -->
500 +    <property name="build.args" value="${warnunchecked.arg}"/>
501  
259  <target name="compile-ant-filter" depends="init">
260    <mkdir dir="${build.ant.dir}"/>
261    <javac srcdir="${ant.src.dir}"
262          destdir="${build.ant.dir}"
263           source="1.4"
264    />
502    </target>
503  
504  
505 <  <target name="filter-src" depends="compile-ant-filter">
506 <    <mkdir dir="${build.filter.src.dir}"/>
270 <    <copy todir="${build.filter.src.dir}">
271 <      <fileset dir="${src.dir}">
272 <        <include name="**/*.java"/>
273 <      </fileset>
274 <      <filterchain>
275 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
276 <                      classpath="${build.ant.dir}">
277 <          <!--
278 <           # These arguments are to get rid of angle-bracketed type
279 <           # parameters so that javadoc can run on the result. The
280 <           # following heuristic that seems to work:
281 <           #
282 <           # For all lines not starting with space(s)-asterisk-space(s),
283 <           #   replace <something> with a space, where there may be more
284 <           #   than one right angle bracket at the end, and "something"
285 <           #   must not contain parens or pipes. (This may need some
286 <           #   tweaking.)
287 <           -->
288 <          <param name="notmatching" value="^\s+\*\s.*$"/>
289 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
290 <          <param name="replacement" value=" "/>
291 <        </filterreader>
292 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
293 <                      classpath="${build.ant.dir}">
294 <          <!--
295 <           # These arguments are to uncomment lines beginning with
296 <           # "//@" so that javadoc can see imports that are needed
297 <           # to resolve links but that shouldn't be in the compiled
298 <           # code.
299 <           -->
300 <          <param name="matching" value="^//@.*$"/>
301 <          <param name="pattern" value="^//@"/>
302 <          <param name="replacement" value=""/>
303 <        </filterreader>
304 <      </filterchain>
305 <    </copy>
306 <  </target>
505 >  <target name="compile-test-loops" depends="jar"
506 >          description="Compiles all the perf tests in src/test/loops">
507  
508 +    <mkdir dir="${build.dir}/test/loops"/>
509  
510 <  <target name="compile-tests" depends="jar">
511 <    <mkdir dir="${build.testcases.dir}"/>
512 <    <javac srcdir="${test.src.dir}"
513 <          destdir="${build.testcases.dir}"
514 <            debug="${build.debug}"
515 <       debuglevel="${build.debuglevel}"
516 <      deprecation="${build.deprecation}"
517 <           source="${build.sourcelevel}"
518 <             fork="true">
519 <
319 <      <bootclasspath refid="javac.bootclasspath"/>
320 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
321 <      <classpath refid="test.classpath"/>
510 >    <javac srcdir="${basedir}/src/test/loops"
511 >           destdir="${build.dir}/test/loops"
512 >           debug="${build.debug}"
513 >           debuglevel="${build.debuglevel}"
514 >           deprecation="${build.deprecation}"
515 >           includeAntRuntime="false"
516 >           includeJavaRuntime="false"
517 >           encoding="ASCII"
518 >           executable="${build.main.javac}"
519 >           fork="true">
520  
521 +      <include name="*.java"/>
522 +      <compilerarg value="-XDignore.symbol.file=true"/>
523 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
524 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
525 +      <compilerarg line="${build.args}"/>
526      </javac>
527    </target>
528  
529  
530 <  <target name="run-tests" depends="compile-tests">
531 <    <mkdir dir="${build.reports.dir}"/>
532 <    <junit printsummary="true"
533 <             showoutput="true"
534 <          errorProperty="junit.failed"
535 <        failureProperty="junit.failed"
536 <                    dir="${build.reports.dir}"
537 <                   fork="true">
538 <
539 <      <!--
540 <       ! This nastiness is so JUnit can test classes we are inserting
541 <       ! into the java.* packages.
542 <       -->
543 <      <jvmarg value="-Xbootclasspath/p:${product.jar};${build.testcases.dir};${junit.jar}"/>
544 <
545 <      <formatter type="xml"/>
546 <
547 <      <batchtest todir="${build.reports.dir}">
548 <        <fileset dir="${test.src.dir}">
549 <          <include name="**/${testcase}Test.java"/>
550 <        </fileset>
348 <      </batchtest>
349 <
350 <    </junit>
530 >  <!-- old branches no longer maintained.  build support deleted -->
531 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
532 >  <!-- jsr166 4jdk7 (no longer maintained) -->
533 >  <!-- jsr166x (no longer maintained) -->
534 >  <!-- jsr166y (no longer maintained) -->
535 >  <!-- extra166y (no longer maintained) -->
536 >  <!-- jsr166e (no longer maintained) -->
537 >
538 > <!-- Find buglets that can be detected by static build tools -->
539 >
540 > <!--   <target name="lint"> -->
541 > <!--     <antcall target="dists"> -->
542 > <!--       <param name="build.javadoc.access" value="protected"/> -->
543 > <!--     </antcall> -->
544 > <!--   </target> -->
545 >
546 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
547 >  <target name="doclint-private">
548 >    <antcall target="dist">
549 >      <param name="build.javadoc.access" value="private"/>
550 >    </antcall>
551    </target>
552  
553  
554 <  <target name="report-tests" depends="run-tests">
555 <    <!-- Sets junit.report.format to frames if Xalan is present,
556 <         otherwise sets it to noframes. -->
557 <    <available property="junit.report.format"
558 <                  value="frames"
559 <              classname="org.apache.xalan.lib.Redirect"
560 <    />
561 <    <property name="junit.report.format" value="noframes"/>
562 <
563 <    <junitreport todir="${build.reports.dir}">
564 <      <fileset dir="${build.reports.dir}">
565 <        <include name="TEST-*.xml"/>
566 <      </fileset>
567 <      <report styledir="${stylesheet.dir}"
568 <                format="${junit.report.format}"
569 <                 todir="${build.reports.dir}"
570 <      />
571 <    </junitreport>
554 > <!-- ==============================================================
555 >  Experimental errorprone support
556 >  https://errorprone.info
557 >  https://errorprone.info/docs/installation
558 >  https://github.com/google/error-prone/issues/1143
559 > =================================================================== -->
560 >  <path id="errorprone.processorpath.path">
561 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
562 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
563 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
564 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
565 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
566 >  </path>
567 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
568 >  <property name="errorprone.jsr166.user.flags" value=""/>
569 >  <property name="errorprone.jsr166.flags"
570 >            value="-Xep:HashtableContains:OFF
571 >                   -Xep:PreferJavaTimeOverload:OFF
572 >                   -Xep:JdkObsolete:OFF
573 >                   -Xep:MissingOverride:OFF
574 >                   -Xep:MissingFail:OFF
575 >                   -Xep:ThreadPriorityCheck:OFF
576 >                   -Xep:MixedArrayDimensions:ERROR
577 >                   -Xep:RemoveUnusedImports:ERROR
578 >                   -Xep:EmptyIf:ERROR
579 >                   -Xep:MultipleTopLevelClasses:ERROR
580 >                   -Xep:ClassName:ERROR
581 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
582 >                   -Xep:RedundantThrows:ERROR
583 >                   -Xep:IdentityBinaryExpression:WARN
584 >                   -Xep:ConstructorInvokesOverridable:WARN
585 >                   -Xep:MethodCanBeStatic:WARN
586 >                   ${errorprone.jsr166.user.flags}"/>
587 >  <!-- -Xep:WildcardImport:ERROR -->
588 >  <property name="errorprone.jsr166.test.flags"
589 >            value="-Xep:StringSplitter:OFF
590 >                   -Xep:BoxedPrimitiveConstructor:OFF
591 >                   -Xep:UnnecessaryParentheses:OFF
592 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
593 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
594 >  <target name="errorprone"
595 >          depends="clean, configure-compiler"
596 >          description="Run errorprone over jsr166 source code (experimental)">
597 >
598 >    <local name="destdir"/>
599 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
600 >    <mkdir dir="${destdir}"/>
601  
602 <    <fail message="Test Cases Failed" if="junit.failed"/>
603 <  </target>
602 >    <javac srcdir="${src.dir}"
603 >           destdir="${destdir}"
604 >           debug="${build.debug}"
605 >           debuglevel="${build.debuglevel}"
606 >           deprecation="${build.deprecation}"
607 >           classpath=""
608 >           includeAntRuntime="false"
609 >           includeJavaRuntime="false"
610 >           encoding="ASCII"
611 >           executable="${build.main.javac}"
612 >           fork="true">
613 >
614 >      <include name="**/*.java"/>
615 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
616 >      <compilerarg value="-J--illegal-access=permit"/>
617 >      <compilerarg value="-XDcompilePolicy=simple"/>
618 >      <compilerarg value="-processorpath"/>
619 >      <compilerarg pathref="errorprone.processorpath.path"/>
620 >      <compilerarg value="-Xplugin:ErrorProne
621 >                          ${errorprone.jsr166.flags}"/>
622 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
623 >      <compilerarg value="-Xprefer:source"/>
624 >      <compilerarg value="-XDignore.symbol.file=true"/>
625 >      <compilerarg value="-Xlint:all"/>
626 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
627 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
628 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
629 >      <compilerarg line="${build.args}"/>
630 >    </javac>
631  
632 +    <jar destfile="${product.jar}">
633 +      <fileset dir="${destdir}"/>
634 +    </jar>
635 +
636 +    <run-tck-tests
637 +      target="${java.runtime.target}"
638 +      workdir="${build.dir}"
639 +      classes="${product.jar}">
640 +      <javac-elements>
641 +        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
642 +        <compilerarg value="-J--illegal-access=permit"/>
643 +        <compilerarg value="-XDcompilePolicy=simple"/>
644 +        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
645 +        <compilerarg value="-Xplugin:ErrorProne
646 +                            ${errorprone.jsr166.flags}
647 +                            ${errorprone.jsr166.test.flags}"/>
648 +        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
649 +        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
650 +      </javac-elements>
651 +    </run-tck-tests>
652 +  </target>
653 +
654 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
655 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
656 +  <target name="errorprone-jtreg"
657 +          depends="jar"
658 +          description="Run errorprone over jtreg tests (experimental)">
659 +
660 +    <run-jtreg-tests
661 +       target="${java.runtime.target}"
662 +       workdir="${build.dir}"
663 +       classes="${product.jar}"
664 +       verbose="all">
665 +      <jtreg-elements>
666 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
667 +        <arg value="-javacoption:-processorpath"/>
668 +        <arg value="-javacoption:${errorprone.processorpath}"/>
669 +        <arg value="-javacoption:-Xplugin:ErrorProne
670 +                            ${errorprone.jsr166.flags}
671 +                            ${errorprone.jsr166.test.flags}
672 +                            -Xep:MultipleTopLevelClasses:WARN
673 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
674 +      </jtreg-elements>
675 +    </run-jtreg-tests>
676 +  </target>
677 +
678 +
679 + <!-- ==============================================================
680 +  Running guava tests against jsr166 code
681 + =================================================================== -->
682 +
683 + <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
684 + <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
685 + <!-- <property name="guava.version" value="21.0"/> -->
686 +
687 + <!-- HOWTO debug print a path id -->
688 + <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
689 + <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
690 +
691 + <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
692 + <!--   organisation="com.google.guava" module="guava-tests"/> -->
693 + <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
694 + <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
695 + <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
696 + <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
697 +
698 + <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
699 + <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
700 + <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
701 + <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
702 +
703 + <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
704 + <!--   type="*" inline="true" conf="*(private),*(public)" -->
705 + <!--   pattern="${guava.dir}/[artifact].[ext]" -->
706 + <!--   organisation="com.google.guava" module="guava-testlib"/> -->
707 +
708 + <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
709 + <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
710 + <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
711 +
712 +  <target name="init-ivy">
713 +    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
714 +         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
715 +    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
716 +             classpath="${build.dir}/ivy.jar"/>
717 +  </target>
718 +
719 +  <target name="guava-tests" depends="jar, init-ivy"
720 +          description="Guava tests run against jsr166 collections">
721 +    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
722 +    <mkdir dir="${guava.dir}"/>
723 +    <ivy:retrieve pathid="guava.testlib.classpath"
724 +      type="jar,bundle" inline="true" conf="default,master"
725 +      pattern="${guava.dir}/[artifact].[ext]"
726 +      organisation="com.google.guava" module="guava-testlib"/>
727 +    <property name="guava.version" value="21.0"/>
728 +    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
729 +         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
730 +    <junit printsummary="true" showoutput="true" haltonfailure="true"
731 +           jvm="${build.main.java}" fork="true">
732 +      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
733 +      <formatter type="brief"/>
734 +      <classpath>
735 +        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
736 +        <path refid="guava.testlib.classpath"/>
737 +      </classpath>
738  
739 <  <target name="check-junit">
740 <    <!-- FIXME: this test isn't specific enough -->
741 <    <available property="junit.available"
380 <               classname="junit.framework.TestCase"/>
381 <    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
739 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
740 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
741 >    </junit>
742    </target>
743  
384
744   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines