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.247 by jsr166, Fri Jun 16 21:30:00 2017 UTC vs.
Revision 1.282 by jsr166, Tue Oct 9 01:34:19 2018 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 21 | Line 22
22    $HOME/jdk/jdk8
23    $HOME/jdk/jdk9
24    $HOME/jdk/jdk10
25 +  $HOME/jdk/jdk11
26 +  $HOME/jdk/jdk12
27    where each of the above is a JDK or a symlink to same, and
28    $HOME/jdk/src/jdk8
29    $HOME/jdk/src/jdk9
30    $HOME/jdk/src/jdk10
31 +  $HOME/jdk/src/jdk11
32 +  $HOME/jdk/src/jdk12
33    where each of the above is a complete JDK source tree
34    (e.g. mercurial forest) or a symlink to same.
35  
# Line 101 | Line 106
106      <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107        unless:set="have.java.base"/>
108      <local name="modules"/>
109 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
109 >    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110      <local name="boot.jar.dir"/>
111      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112      <path id="bootclasspath@{v}" unless:set="modules">
# Line 132 | Line 137
137    <defjdklocations v="8"/>
138    <defjdklocations v="9"/>
139    <defjdklocations v="10"/>
140 +  <defjdklocations v="11"/>
141 +  <defjdklocations v="12"/>
142  
143    <!-- Source locations -->
144    <property name="src.dir"              location="${basedir}/src/main"/>
# Line 142 | Line 149
149    <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
150    <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151    <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
152 +  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
153 +  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154    <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
155    <property name="lib.dir"              location="${basedir}/lib"/>
156    <property name="dist.dir"             location="${basedir}/dist"/>
# Line 181 | Line 190
190    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
191  
192    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
193 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
194 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
195 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
196 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
197 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
198 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
199 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
193 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
194 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
195 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
196 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
197 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
198 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199 >  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
200 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
201 >  <!-- The location of jdk early access docs (RIP) -->
202 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203 >  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
204 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205 >  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206    <!-- Default jdk doc location (latest stable release seems best) -->
207 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
207 >  <!-- But pin to jdk 10 until fix for -->
208 >  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
209 >  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
210  
211    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
212    <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
# Line 197 | Line 214
214    <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
215    <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
216    <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
217 +  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
218 +  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
219 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
220    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
221  
222    <!-- Define the "jtreg" task -->
# Line 229 | Line 249
249  
250      <local name="modules"/>
251      <condition property="modules">
252 <      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
252 >      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
253      </condition>
254  
255      <local name="use-doclint"/>
# Line 296 | Line 316
316    </macrodef>
317  
318    <!-- Define jtreg test sets for different jdk versions -->
319 <  <fileset dir="${jtreg10.src.dir}">
320 <    <patternset id="jdk10.jtreg.tests">
321 <      <include name="**/*.java"/>
322 <    </patternset>
323 <  </fileset>
324 <
325 <  <fileset dir="${jtreg9.src.dir}">
326 <    <patternset id="jdk9.jtreg.tests">
327 <      <include name="**/*.java"/>
328 <    </patternset>
329 <  </fileset>
330 <
331 <  <fileset dir="${jtreg8.src.dir}">
312 <    <patternset id="jdk8.jtreg.tests">
313 <      <include name="**/*.java"/>
314 <    </patternset>
315 <  </fileset>
319 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
320 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
321 >  <property name="jtreg.test.pattern" value="**/*.java"/>
322 >  <macrodef name="defjtregtests">
323 >    <attribute name="v"/>
324 >    <sequential>
325 >      <fileset dir="${jtreg@{v}.src.dir}">
326 >        <patternset id="jdk@{v}.jtreg.tests">
327 >          <include name="${jtreg.test.pattern}"/>
328 >        </patternset>
329 >      </fileset>
330 >    </sequential>
331 >  </macrodef>
332  
333 <  <fileset dir="${jtreg7.src.dir}">
334 <    <patternset id="jdk7.jtreg.tests">
335 <      <include name="**/*.java"/>
336 <    </patternset>
337 <  </fileset>
333 >  <defjtregtests v="12"/>
334 >  <defjtregtests v="11"/>
335 >  <defjtregtests v="10"/>
336 >  <defjtregtests v="9"/>
337 >  <defjtregtests v="8"/>
338 >  <defjtregtests v="7"/>
339  
340    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
341    <property name="jtreg.flags" value=""/>
# Line 328 | Line 345
345      <attribute name="target"/>
346      <attribute name="workdir"/>
347      <attribute name="classes"/>
348 +    <attribute name="verbose" default="${jtreg.verbose}"/>
349      <attribute name="jtregflags" default=""/>
350 +    <element name="jtreg-elements" optional="true"/>
351  
352      <sequential>
353  
# Line 337 | Line 356
356  
357      <local name="modules"/>
358      <condition property="modules">
359 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
359 >      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
360      </condition>
361  
362      <delete dir="@{workdir}/JTwork"   quiet="true"/>
# Line 346 | Line 365
365             workDir="@{workdir}/JTwork">
366        <patternset refid="jdk@{target}.jtreg.tests"/>
367        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
368 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
369 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
368 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
369 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
370        <arg value="-agentvm"/>
371        <arg value="-noreport"/>
372 <      <arg value="-verbose:${jtreg.verbose}"/>
372 >      <arg value="-verbose:@{verbose}"/>
373        <arg value="-vmoptions:-esa -ea"/>
374        <arg value="-automatic"/>
375        <arg value="-k:!ignore"/>
376        <arg line="@{jtregflags}"/>
377        <arg line="${jtreg.flags}"/>
378 +      <jtreg-elements/>
379      </jtreg>
380      </sequential>
381    </macrodef>
# Line 371 | Line 391
391  
392    <!-- Main targets -->
393  
394 <  <property name="build.main.java.version" value="9"/>
394 >  <property name="build.main.java.version" value="11"/>
395    <!-- Workaround "no nested properties in ant" -->
396    <macrodef name="define-build-main-properties">
397      <attribute name="v"/>
398      <sequential>
399        <property name="build.main.java"    value="${java@{v}}"/>
400        <property name="build.main.javac"   value="${javac@{v}}"/>
401 <      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
401 >      <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402 >      <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403 >      <condition property="build.main.javadoc"
404 >                 value="${javadoc12}"
405 >                 else="${javadoc@{v}}">
406 >        <matches pattern="^(9|10|11)$" string="@{v}"/>
407 >      </condition>
408      </sequential>
409    </macrodef>
410    <define-build-main-properties v="${build.main.java.version}"/>
# Line 386 | Line 412
412    <target name="dists"
413            depends="dist, 4jdk8dist"
414            description="Builds all public jars and docs"/>
415 <          <!--
390 <              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
391 <          -->
415 >          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
416  
417    <target name="compile"
418            depends="configure-compiler"
# Line 457 | Line 481
481   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
482      <javadoc destdir="${docs.dir}"
483               packagenames="none"
484 <             link="${java9.api.url}"
484 >             link="${java11.api.url}"
485               overview="${src.dir}/intro.html"
486               access="${build.javadoc.access}"
487               sourcepath="${src.dir}"
488               classpath=""
489 <             source="9"
489 >             source="11"
490               executable="${build.main.javadoc}">
491        <fileset dir="${src.dir}" defaultexcludes="yes">
492          <include name="**/*.java"/>
493        </fileset>
494 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
494 >      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
495        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
496        <arg value="-XDignore.symbol.file=true"/>
497        <arg value="-html5"/>
498        <arg value="--patch-module=java.base=${src.dir}"/>
499 <      <arg value="-tag"/>
500 <      <arg value="${javadoc.jls.option}"/>
501 < <!-- @apiNote currently unused -->
502 < <!--       <arg value="-tag"/> -->
503 < <!--       <arg value="apiNote:a:API Note:"/> -->
504 <      <arg value="-tag"/>
481 <      <arg value="implSpec:a:Implementation Requirements:"/>
482 <      <arg value="-tag"/>
483 <      <arg value="implNote:a:Implementation Note:"/>
499 >      <arg value="--frames"/>
500 >      <arg value="--override-methods=summary"/>
501 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
502 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
503 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
504 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
505   <!-- tags added in jdk9: currently unused -->
506 < <!--       <arg value="-tag"/> -->
507 < <!--       <arg value="revised:X"/> -->
487 < <!--       <arg value="-tag"/> -->
488 < <!--       <arg value="spec:X"/> -->
506 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
507 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
508      </javadoc>
509    </target>
510  
# Line 597 | Line 616
616  
617   <!--   </target> -->
618  
619 < <!--   <target name="test89" -->
620 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
619 >  <target name="test9101112"
620 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
621  
622 < <!--     <antcall target="clean"/> -->
623 < <!--     <antcall target="test"> -->
624 < <!--       <param name="build.main.java.version" value="8"/> -->
625 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
626 < <!--     </antcall> -->
622 >    <antcall target="clean"/>
623 >    <antcall target="test">
624 >      <param name="build.main.java.version" value="9"/>
625 >      <param name="build.main.java" value="${java9}"/>
626 >      <param name="build.main.javac" value="${javac9}"/>
627 >    </antcall>
628  
629 < <!--     <antcall target="clean"/> -->
630 < <!--     <antcall target="test"> -->
631 < <!--       <param name="build.main.java.version" value="9"/> -->
632 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
633 < <!--     </antcall> -->
629 >    <antcall target="clean"/>
630 >    <antcall target="test">
631 >      <param name="build.main.java.version" value="10"/>
632 >      <param name="build.main.java" value="${java10}"/>
633 >      <param name="build.main.javac" value="${javac10}"/>
634 >    </antcall>
635  
636 < <!--   </target> -->
636 >    <antcall target="clean"/>
637 >    <antcall target="test">
638 >      <param name="build.main.java.version" value="11"/>
639 >      <param name="build.main.java" value="${java11}"/>
640 >      <param name="build.main.javac" value="${javac11}"/>
641 >    </antcall>
642 >
643 >    <antcall target="clean"/>
644 >    <antcall target="test">
645 >      <param name="build.main.java.version" value="12"/>
646 >      <param name="build.main.java" value="${java12}"/>
647 >      <param name="build.main.javac" value="${javac12}"/>
648 >    </antcall>
649 >    <antcall target="docs">
650 >      <param name="build.main.java.version" value="12"/>
651 >      <param name="build.main.java" value="${java12}"/>
652 >      <param name="build.main.javac" value="${javac12}"/>
653 >      <param name="build.main.javadoc" value="${javadoc12}"/>
654 >    </antcall>
655 >
656 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
657 >    <antcall target="clean"/>
658 >
659 >  </target>
660  
661  
662  
# Line 821 | Line 865
865        </fileset>
866        <arg line="-Xdocrootparent ${java8.docroot.url}"/>
867        <arg value="-XDignore.symbol.file=true"/>
868 <      <arg value="-tag"/>
869 <      <arg value="${javadoc.jls.option}"/>
870 < <!-- @apiNote currently unused -->
871 < <!--       <arg value="-tag"/> -->
872 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
829 <      <arg value="-tag"/>
830 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
831 <      <arg value="-tag"/>
832 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
868 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
869 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
870 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
871 > <!-- @apiNote tag currently unused -->
872 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
873      </javadoc>
874    </target>
875  
# Line 1359 | Line 1399
1399  
1400   <!-- Find buglets that can be detected by static build tools -->
1401  
1402 <  <target name="lint">
1403 <    <antcall target="dists">
1404 <      <param name="build.javadoc.access" value="public"/>
1405 <    </antcall>
1406 <  </target>
1402 > <!--   <target name="lint"> -->
1403 > <!--     <antcall target="dists"> -->
1404 > <!--       <param name="build.javadoc.access" value="protected"/> -->
1405 > <!--     </antcall> -->
1406 > <!--   </target> -->
1407  
1408   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1409 <  <target name="lint-private">
1409 >  <target name="doclint-private">
1410      <antcall target="dist">
1411        <param name="build.javadoc.access" value="private"/>
1412      </antcall>
# Line 1374 | Line 1414
1414  
1415  
1416   <!-- ==============================================================
1417 <  Experimental errorprone support - http://errorprone.info
1378 <  You may need to bring your own errorprone jar.
1417 >  Experimental errorprone support - https://errorprone.info
1418   =================================================================== -->
1419 +  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1420 +  <property name="errorprone.jsr166.user.flags" value=""/>
1421 +  <property name="errorprone.jsr166.flags"
1422 +            value="-Xep:HashtableContains:OFF
1423 +                   -Xep:JdkObsolete:OFF
1424 +                   -Xep:MissingOverride:OFF
1425 +                   -Xep:MissingFail:OFF
1426 +                   -Xep:MixedArrayDimensions:ERROR
1427 +                   -Xep:RemoveUnusedImports:ERROR
1428 +                   -Xep:EmptyIf:ERROR
1429 +                   -Xep:MultipleTopLevelClasses:ERROR
1430 +                   -Xep:ClassName:ERROR
1431 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1432 +                   -Xep:RedundantThrows:ERROR
1433 +                   -Xep:IdentityBinaryExpression:WARN
1434 +                   -Xep:MethodCanBeStatic:WARN
1435 +                   ${errorprone.jsr166.user.flags}"/>
1436 +  <!-- -Xep:WildcardImport:ERROR -->
1437 +  <property name="errorprone.jsr166.test.flags"
1438 +            value="-Xep:StringSplitter:OFF
1439 +                   -Xep:BoxedPrimitiveConstructor:OFF
1440 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
1441 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1442    <target name="errorprone"
1443            depends="clean, configure-compiler"
1444            description="Run errorprone over jsr166 source code (experimental)">
# Line 1398 | Line 1460
1460             fork="true">
1461  
1462        <include name="**/*.java"/>
1463 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1464 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1465 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1466 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1405 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1406 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1407 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1408 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1409 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1410 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1463 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1464 >      <compilerarg value="-J--illegal-access=permit"/>
1465 >      <compilerarg value="-XDcompilePolicy=simple"/>
1466 >      <compilerarg line="-processorpath ${errorprone.jar}"/>
1467        <compilerarg value="-Xplugin:ErrorProne
1468 <                          -Xep:IdentityBinaryExpression:WARN
1413 <                          -Xep:MissingOverride:OFF
1414 <                          -Xep:MixedArrayDimensions:WARN
1415 <                          -Xep:RemoveUnusedImports:ERROR
1416 <                          -Xep:ClassName:ERROR
1417 <                          -Xep:MultipleTopLevelClasses:ERROR
1418 <                          -Xep:EmptyIf:ERROR
1419 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1420 <                          -Xep:ArgumentParameterSwap:ERROR
1421 <                          -Xep:RedundantThrows:ERROR
1422 <                          -Xep:MethodCanBeStatic:WARN"/>
1468 >                          ${errorprone.jsr166.flags}"/>
1469        <compilerarg value="--patch-module=java.base=${src.dir}"/>
1470        <compilerarg value="-Xprefer:source"/>
1471        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1438 | Line 1484
1484        workdir="${build.dir}"
1485        classes="${product.jar}">
1486        <javac-elements>
1487 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1488 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1489 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1490 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1445 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1446 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1447 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1448 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1449 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1450 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1487 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1488 >        <compilerarg value="-J--illegal-access=permit"/>
1489 >        <compilerarg value="-XDcompilePolicy=simple"/>
1490 >        <compilerarg line="-processorpath ${errorprone.jar}"/>
1491          <compilerarg value="-Xplugin:ErrorProne
1492 <                            -Xep:IdentityBinaryExpression:WARN
1493 <                            -Xep:BoxedPrimitiveConstructor:OFF
1454 <                            -Xep:HashtableContains:OFF
1455 <                            -Xep:ModifyingCollectionWithItself:OFF
1456 <                            -Xep:MissingOverride:OFF
1457 <                            -Xep:MixedArrayDimensions:WARN
1458 <                            -Xep:RemoveUnusedImports:ERROR
1459 <                            -Xep:ClassName:ERROR
1460 <                            -Xep:MultipleTopLevelClasses:ERROR
1461 <                            -Xep:EmptyIf:ERROR
1462 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1463 <                            -Xep:ArgumentParameterSwap:ERROR
1464 <                            -Xep:RedundantThrows:ERROR
1465 <                            -Xep:MethodCanBeStatic:WARN"/>
1492 >                            ${errorprone.jsr166.flags}
1493 >                            ${errorprone.jsr166.test.flags}"/>
1494          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1495        </javac-elements>
1496      </run-tck-tests>
1497    </target>
1498  
1499 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1500 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1501 +  <target name="errorprone-jtreg"
1502 +          depends="jar"
1503 +          description="Run errorprone over jtreg tests (experimental)">
1504 +
1505 +    <run-jtreg-tests
1506 +       target="${build.main.java.version}"
1507 +       workdir="${build.dir}"
1508 +       classes="${product.jar}"
1509 +       verbose="all">
1510 +      <jtreg-elements>
1511 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1512 +        <arg value="-javacoption:-processorpath"/>
1513 +        <arg value="-javacoption:${errorprone.jar}"/>
1514 +        <arg value="-javacoption:-Xplugin:ErrorProne
1515 +                            ${errorprone.jsr166.flags}
1516 +                            ${errorprone.jsr166.test.flags}
1517 +                            -Xep:MultipleTopLevelClasses:WARN
1518 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1519 +      </jtreg-elements>
1520 +    </run-jtreg-tests>
1521 +  </target>
1522 +
1523  
1524   <!-- ==============================================================
1525    Running guava tests against jsr166 code
# Line 1522 | Line 1574
1574           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1575      <junit printsummary="true" showoutput="true" haltonfailure="true"
1576             jvm="${build.main.java}" fork="true">
1577 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1577 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1578        <formatter type="brief"/>
1579        <classpath>
1580          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines