/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.159 by jsr166, Fri Oct 3 23:18:13 2014 UTC revision 1.168 by jsr166, Wed Sep 2 02:14:59 2015 UTC
# Line 213  Line 213 
213             source="@{compile-target}"             source="@{compile-target}"
214             target="@{compile-target}"             target="@{compile-target}"
215             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
216             includeAntRuntime="false"             includeAntRuntime="false"
217             includeJavaRuntime="false"             includeJavaRuntime="false"
218             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
# Line 222  Line 221 
221        <include name="*.java"/>        <include name="*.java"/>
222        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
223        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224          <compilerarg value="-Xbootclasspath/p:@{classes}"/>
225        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
226        <javac-elements/>        <javac-elements/>
227    
# Line 233  Line 233 
233            fork="true">            fork="true">
234          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
235          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
236    
237            <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238            <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239              <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240            </syspropertyset>
241    
242          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
# Line 245  Line 251 
251      </sequential>      </sequential>
252    </macrodef>    </macrodef>
253    
254      <!-- Define jtreg test sets for different jdk versions -->
255      <fileset dir="${jtreg.src.dir}">
256        <patternset id="jdk9.jtreg.tests">
257          <include name="**/*.java"/>
258        </patternset>
259      </fileset>
260    
261      <fileset dir="${jtreg.src.dir}">
262        <patternset id="jdk8.jtreg.tests">
263          <include name="**/*.java"/>
264          <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266          <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
267        </patternset>
268      </fileset>
269    
270      <fileset dir="${jtreg.src.dir}">
271        <patternset id="jdk7.jtreg.tests">
272          <include name="**/*.java"/>
273          <exclude name="util/Collection/CollectionDefaults.java"/>
274          <exclude name="util/List/ListDefaults.java"/>
275          <exclude name="util/Spliterator/**/*.java"/>
276          <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
277          <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278          <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
279        </patternset>
280      </fileset>
281    
282    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
283      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
284      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
# Line 262  Line 296 
296             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
297             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
298             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
299          <patternset refid="jdk@{target}.jtreg.tests"/>
300        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
301        <arg value="-agentvm"/>        <arg value="-agentvm"/>
302        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 313  Line 347 
347        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
348        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
349        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
350          <compilerarg value="-Werror"/>
351        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
352        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
353        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 416  Line 451 
451      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
452    </target>    </target>
453    
454      <target name="tck" depends="test-tck" description="alias for test-tck"/>
455    <target name="test-tck"    <target name="test-tck"
456            depends="jar"            depends="jar"
457            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
# Line 427  Line 462 
462        classes="${product.jar}"/>        classes="${product.jar}"/>
463    </target>    </target>
464    
465      <target name="test-tck-parallelism-1"
466              description="Runs test-tck with given common pool parallelism">
467        <antcall target="test-tck">
468          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
469        </antcall>
470      </target>
471    
472      <target name="test-tck-parallelism-0"
473              description="Runs test-tck with given common pool parallelism">
474        <antcall target="test-tck">
475          <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
476        </antcall>
477      </target>
478    
479      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
480    <target name="test-jtreg"    <target name="test-jtreg"
481            depends="jar"            depends="jar"
482            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
# Line 437  Line 487 
487    </target>    </target>
488    
489    <target name="test"    <target name="test"
490            depends="test-tck, test-jtreg"            depends="test-tck, test-tck-parallelism-1, test-jtreg"
491            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
492    </target>    </target>
493    
494      <target name="jtreg8" description="Runs jtreg tests with jdk8">
495    
496        <antcall target="jtreg">
497          <param name="build.main.java.version" value="8"/>
498          <param name="build.main.javac" value="${javac8}"/>
499        </antcall>
500    
501      </target>
502    
503    <target name="test89"    <target name="test89"
504            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
505    
# Line 507  Line 566 
566    </target>    </target>
567    
568    
569      <target name="compile-test-loops" depends="jar"
570              description="compile all the perf tests in src/test/loops">
571    
572        <mkdir dir="${build.dir}/test/loops"/>
573    
574        <javac srcdir="${basedir}/src/test/loops"
575               destdir="${build.dir}/test/loops"
576               debug="${build.debug}"
577               debuglevel="${build.debuglevel}"
578               deprecation="${build.deprecation}"
579               includeAntRuntime="false"
580               includeJavaRuntime="false"
581               executable="${javac9}"
582               fork="true">
583    
584          <include name="*.java"/>
585          <compilerarg value="-XDignore.symbol.file=true"/>
586          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
587          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
588          <compilerarg line="${build.args}"/>
589    
590        </javac>
591    
592      </target>
593    
594    
595    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
596    
597    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 532  Line 617 
617        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
618        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
619        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
620          <compilerarg value="-Werror"/>
621        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
622    
623      </javac>      </javac>
# Line 636  Line 722 
722      <run-jtreg-tests      <run-jtreg-tests
723         target="7"         target="7"
724         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
725         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
726    </target>    </target>
727    
728    
# Line 719  Line 804 
804        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
805        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
806        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
807          <compilerarg value="-Werror"/>
808        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
809    
810      </javac>      </javac>
# Line 805  Line 891 
891        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
892        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
893        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
894          <compilerarg value="-Werror"/>
895        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
896    
897      </javac>      </javac>
# Line 892  Line 979 
979        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
980        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
981        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
982          <compilerarg value="-Werror"/>
983        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
984    
985      </javac>      </javac>
# Line 979  Line 1067 
1067        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1068        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1069        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1070          <compilerarg value="-Werror"/>
1071        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1072    
1073      </javac>      </javac>
# Line 1005  Line 1094 
1094        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1095        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1096        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1097          <compilerarg value="-Werror"/>
1098        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
1099    
1100      </javac>      </javac>
# Line 1108  Line 1198 
1198    
1199    <target name="lint">    <target name="lint">
1200      <antcall target="dists">      <antcall target="dists">
1201          <param name="build.javadoc.access" value="public"/>
1202        </antcall>
1203      </target>
1204    
1205    <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1206      <target name="lint-private">
1207        <antcall target="dist">
1208        <param name="build.javadoc.access" value="private"/>        <param name="build.javadoc.access" value="private"/>
1209      </antcall>      </antcall>
1210    </target>    </target>
Legend:
Removed from v.1.159  
changed lines
  Added in v.1.168
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27