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

Diff of /jsr166/build.xml

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

revision 1.167 by jsr166, Sun Aug 16 20:11:47 2015 UTC revision 1.178 by jsr166, Sun Sep 13 02:09:35 2015 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage">  <project name="jsr166" default="usage"
2      xmlns:if="ant:if" xmlns:unless="ant:unless">
3    
4    <description>    <description>
5  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 38  Line 39 
39      </java>      </java>
40    </target>    </target>
41    
42      <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
43    
44    <!-- User-specific settings -->    <!-- User-specific settings -->
45    <property file="user.properties"/>    <property file="user.properties"/>
# Line 52  Line 54 
54    
55    <!-- Tck options; see JSR166TestCase.java    <!-- Tck options; see JSR166TestCase.java
56     To profile a single tck test class:     To profile a single tck test class:
57     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58     To stress test a single tck test class:     To stress test a single tck test class:
59     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60    -->    -->
61    <property name="jsr166.profileTests"     value="false"/>    <property name="jsr166.profileTests"     value="false"/>
62    <property name="jsr166.profileThreshold" value="100"/>    <property name="jsr166.profileThreshold" value="100"/>
# Line 93  Line 95 
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>      <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98      <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>      <available property="jdk@{v}.have.java.base"
99          file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
100        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
101          if:set="jdk@{v}.have.java.base"/>
102        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
103          unless:set="jdk@{v}.have.java.base"/>
104      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
105      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
106      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}">
# Line 129  Line 136 
136    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
137    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
138    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
139    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
140      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
141      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
142      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
143    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
144    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
145    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 234  Line 244 
244          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
245          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
246    
247          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
248          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
249            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
250          </syspropertyset>          </syspropertyset>
# Line 252  Line 262 
262    </macrodef>    </macrodef>
263    
264    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
265    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
266      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
267        <include name="**/*.java"/>        <include name="**/*.java"/>
268      </patternset>      </patternset>
269    </fileset>    </fileset>
270    
271    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
272      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
273        <include name="**/*.java"/>        <include name="**/*.java"/>
274        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
275          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
276          <exclude name="**/GCDuringIteration.java"/>
277      </patternset>      </patternset>
278    </fileset>    </fileset>
279    
280    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
281      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
282        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="util/Collection/CollectionDefaults.java"/>  
       <exclude name="util/List/ListDefaults.java"/>  
       <exclude name="util/Spliterator/**/*.java"/>  
       <exclude name="util/concurrent/CompletableFuture/**/*.java"/>  
       <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>  
       <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>  
283      </patternset>      </patternset>
284    </fileset>    </fileset>
285    
286    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
287      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>  
288      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
289      <attribute name="target"/>      <attribute name="target"/>
290      <attribute name="workdir"/>      <attribute name="workdir"/>
# Line 290  Line 295 
295      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
296      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
297      <mkdir dir="@{workdir}/JTreport"/>      <mkdir dir="@{workdir}/JTreport"/>
298      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
299             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
300             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
301             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
# Line 360  Line 365 
365    
366      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
367        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
368          <manifest>
369          <attribute name="Built-By" value="${user.name}"/>
370          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
371          </manifest>
372      </jar>      </jar>
373    </target>    </target>
374    
# Line 418  Line 427 
427        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
428        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
429        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
430          <manifest>
431          <attribute name="Built-By" value="${user.name}"/>
432          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
433          </manifest>
434      </jar>      </jar>
435    </target>    </target>
436    
# Line 449  Line 462 
462      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
463    </target>    </target>
464    
465    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
466            depends="jar"            depends="jar"
467            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
468    
# Line 460  Line 472 
472        classes="${product.jar}"/>        classes="${product.jar}"/>
473    </target>    </target>
474    
475    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
476            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
477      <antcall target="test-tck">      <antcall target="tck">
478        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
479      </antcall>      </antcall>
480    </target>    </target>
481    
482    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
483            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
484      <antcall target="test-tck">      <antcall target="tck">
485        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
486      </antcall>      </antcall>
487    </target>    </target>
488    
489    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="jtreg"
   <target name="test-jtreg"  
490            depends="jar"            depends="jar"
491            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
492      <run-jtreg-tests      <run-jtreg-tests
# Line 485  Line 496 
496    </target>    </target>
497    
498    <target name="test"    <target name="test"
499            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
500            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
501    </target>    </target>
502    
503      <target name="jtreg8" description="Runs jtreg tests with jdk8">
504    
505        <antcall target="jtreg">
506          <param name="build.main.java.version" value="8"/>
507          <param name="build.main.javac" value="${javac8}"/>
508        </antcall>
509    
510      </target>
511    
512    <target name="test89"    <target name="test89"
513            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
514    
# Line 496  Line 516 
516      <antcall target="test">      <antcall target="test">
517        <param name="build.main.java.version" value="8"/>        <param name="build.main.java.version" value="8"/>
518        <param name="build.main.javac" value="${javac8}"/>        <param name="build.main.javac" value="${javac8}"/>
       <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>  
519      </antcall>      </antcall>
520    
521      <antcall target="clean"/>      <antcall target="clean"/>
# Line 649  Line 668 
668    
669      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
670        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
671          <manifest>
672          <attribute name="Built-By" value="${user.name}"/>
673          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
674          </manifest>
675      </jar>      </jar>
676    
677    </target>    </target>
678    
679    
680    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
681            depends="4jdk7jar"            depends="4jdk7jar"
682            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
683    
# Line 666  Line 689 
689          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
690          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
691          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
692            <exclude name="*10Test.java"/>
693          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
694          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
695          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 673  Line 697 
697          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
698          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
699          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
700            <exclude name="SubmissionPublisherTest.java"/>
701        </javac-elements>        </javac-elements>
702      </run-tck-tests>      </run-tck-tests>
703    </target>    </target>
704    
705    
706    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
707            depends="4jdk7compile"            depends="4jdk7compile"
708            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
709    
# Line 706  Line 731 
731      </junit>      </junit>
732    </target>    </target>
733    
734    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
735            depends="4jdk7jar"            depends="4jdk7jar"
736            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
737      <run-jtreg-tests      <run-jtreg-tests
# Line 717  Line 742 
742    
743    
744    <target name="4jdk7-test"    <target name="4jdk7-test"
745            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
746            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
747    </target>    </target>
748    
# Line 807  Line 832 
832    
833      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
834        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
835          <manifest>
836          <attribute name="Built-By" value="${user.name}"/>
837          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
838          </manifest>
839      </jar>      </jar>
840    
841    </target>    </target>
# Line 894  Line 923 
923    
924      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
925        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
926          <manifest>
927          <attribute name="Built-By" value="${user.name}"/>
928          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
929          </manifest>
930      </jar>      </jar>
931    
932    </target>    </target>
# Line 982  Line 1015 
1015    
1016      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1017        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1018          <manifest>
1019          <attribute name="Built-By" value="${user.name}"/>
1020          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1021          </manifest>
1022      </jar>      </jar>
1023    
1024    </target>    </target>
# Line 1097  Line 1134 
1134    
1135      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1136        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1137          <manifest>
1138          <attribute name="Built-By" value="${user.name}"/>
1139          <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1140          </manifest>
1141      </jar>      </jar>
1142    
1143    </target>    </target>
# Line 1122  Line 1163 
1163    </target>    </target>
1164    
1165    
1166    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1167            depends="jsr166ejar">            depends="jsr166ejar">
1168    
1169      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1134  Line 1175 
1175        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1176    </target>    </target>
1177    
1178    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1179            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1180    
1181  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1182  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1183  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1184  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1185  <!--     </antcall> -->  <!--     </antcall> -->
1186    
1187      <antcall target="clean"/>      <antcall target="clean"/>
1188      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1189        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1190        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1191      </antcall>      </antcall>
1192    
1193      <antcall target="clean"/>      <antcall target="clean"/>
1194      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1195        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1196        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1197      </antcall>      </antcall>
# Line 1158  Line 1199 
1199    
1200    
1201    <target name="jsr166e-test"    <target name="jsr166e-test"
1202            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1203            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1204    </target>    </target>
1205    

Legend:
Removed from v.1.167  
changed lines
  Added in v.1.178

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27