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

Diff of /jsr166/build.xml

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

revision 1.172 by jsr166, Wed Sep 2 05:00:20 2015 UTC revision 1.181 by jsr166, Sun Sep 13 05:26:02 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"/>      <local name="have.java.base"/>
99        <available property="have.java.base"
100          file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
101        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
102          if:set="have.java.base"/>
103        <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
104          unless:set="have.java.base"/>
105      <local name="boot.jar.dir"/>      <local name="boot.jar.dir"/>
106      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
107      <path id="bootclasspath@{v}">      <path id="bootclasspath@{v}">
# Line 129  Line 137 
137    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
138    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
139    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
140    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
141      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
142      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
143      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
144    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
145    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
146    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 234  Line 245 
245          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
246          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
247    
248          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
249          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
250            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
251          </syspropertyset>          </syspropertyset>
# Line 252  Line 263 
263    </macrodef>    </macrodef>
264    
265    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
266    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
267      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
268        <include name="**/*.java"/>        <include name="**/*.java"/>
269      </patternset>      </patternset>
270    </fileset>    </fileset>
271    
272    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
273      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
274        <include name="**/*.java"/>        <include name="**/*.java"/>
275        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
276        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
277        <exclude name="util/WeakHashMap/GCDuringIteration.java"/>        <exclude name="**/GCDuringIteration.java"/>
278      </patternset>      </patternset>
279    </fileset>    </fileset>
280    
281    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
282      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
283        <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="**/CompletableFuture/**/*.java"/>  
       <exclude name="**/ConcurrentAssociateTest.java"/>  
       <exclude name="**/ConcurrentContainsKeyTest.java"/>  
       <exclude name="**/ConcurrentHashMap/ToArray.java"/>  
       <exclude name="**/ConcurrentRemoveIf.java"/>  
       <exclude name="**/COWSubList.java"/>  
       <exclude name="**/FutureTask/NegativeTimeout.java"/>  
       <exclude name="**/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java"/>  
       <exclude name="**/forkjoin/SubmissionTest.java"/>  
       <exclude name="**/StampedLock/**/*.java"/>  
       <exclude name="**/AtomicReferenceTest.java"/>  
       <exclude name="util/concurrent/atomic/Serial.java"/>  
284      </patternset>      </patternset>
285    </fileset>    </fileset>
286    
287    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
288      <!-- 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}"/>  
289      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
290      <attribute name="target"/>      <attribute name="target"/>
291      <attribute name="workdir"/>      <attribute name="workdir"/>
# Line 301  Line 296 
296      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
297      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
298      <mkdir dir="@{workdir}/JTreport"/>      <mkdir dir="@{workdir}/JTreport"/>
299      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
300             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
301             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
302             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
# Line 371  Line 366 
366    
367      <jar destfile="${product.jar}">      <jar destfile="${product.jar}">
368        <fileset dir="${build.classes.dir}"/>        <fileset dir="${build.classes.dir}"/>
369          <manifest>
370            <attribute name="Built-By" value="${user.name}"/>
371            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
372          </manifest>
373      </jar>      </jar>
374    </target>    </target>
375    
# Line 429  Line 428 
428        <exclude name="src/emulation/**"/>        <exclude name="src/emulation/**"/>
429        <exclude name="**/SyntaxTest.java"/>        <exclude name="**/SyntaxTest.java"/>
430        <exclude name="**/SuperfluousAbstract.java"/>        <exclude name="**/SuperfluousAbstract.java"/>
431          <manifest>
432            <attribute name="Built-By" value="${user.name}"/>
433            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
434          </manifest>
435      </jar>      </jar>
436    </target>    </target>
437    
# Line 460  Line 463 
463      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
464    </target>    </target>
465    
466    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
467            depends="jar"            depends="jar"
468            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
469    
# Line 471  Line 473 
473        classes="${product.jar}"/>        classes="${product.jar}"/>
474    </target>    </target>
475    
476    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
477            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
478      <antcall target="test-tck">      <antcall target="tck">
479        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
480      </antcall>      </antcall>
481    </target>    </target>
482    
483    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
484            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
485      <antcall target="test-tck">      <antcall target="tck">
486        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
487      </antcall>      </antcall>
488    </target>    </target>
489    
490    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="jtreg"
   <target name="test-jtreg"  
491            depends="jar"            depends="jar"
492            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
493      <run-jtreg-tests      <run-jtreg-tests
# Line 496  Line 497 
497    </target>    </target>
498    
499    <target name="test"    <target name="test"
500            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
501            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
502    </target>    </target>
503    
# Line 529  Line 530 
530    
531    
532    <target name="configure-compiler">    <target name="configure-compiler">
533        <fail message="ant version too old">
534          <condition>
535            <not> <antversion atleast="1.9.1"/> </not>
536          </condition>
537        </fail>
538    
539      <property name="unchecked.option" value="-Xlint:unchecked"/>      <property name="unchecked.option" value="-Xlint:unchecked"/>
540    
# Line 668  Line 674 
674    
675      <jar destfile="${4jdk7product.jar}">      <jar destfile="${4jdk7product.jar}">
676        <fileset dir="${build.4jdk7.classes.dir}"/>        <fileset dir="${build.4jdk7.classes.dir}"/>
677          <manifest>
678            <attribute name="Built-By" value="${user.name}"/>
679            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
680          </manifest>
681      </jar>      </jar>
682    
683    </target>    </target>
684    
685    
686    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
687            depends="4jdk7jar"            depends="4jdk7jar"
688            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
689    
# Line 685  Line 695 
695          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
696          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
697          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
698            <exclude name="*10Test.java"/>
699          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
700          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
701          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 692  Line 703 
703          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
704          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
705          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
706            <exclude name="SubmissionPublisherTest.java"/>
707        </javac-elements>        </javac-elements>
708      </run-tck-tests>      </run-tck-tests>
709    </target>    </target>
710    
711    
712    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
713            depends="4jdk7compile"            depends="4jdk7compile"
714            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
715    
# Line 725  Line 737 
737      </junit>      </junit>
738    </target>    </target>
739    
740    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
741            depends="4jdk7jar"            depends="4jdk7jar"
742            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
743      <run-jtreg-tests      <run-jtreg-tests
# Line 736  Line 748 
748    
749    
750    <target name="4jdk7-test"    <target name="4jdk7-test"
751            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
752            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
753    </target>    </target>
754    
# Line 826  Line 838 
838    
839      <jar destfile="${jsr166x.jar}">      <jar destfile="${jsr166x.jar}">
840        <fileset dir="${build.jsr166x.classes.dir}"/>        <fileset dir="${build.jsr166x.classes.dir}"/>
841          <manifest>
842            <attribute name="Built-By" value="${user.name}"/>
843            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
844          </manifest>
845      </jar>      </jar>
846    
847    </target>    </target>
# Line 913  Line 929 
929    
930      <jar destfile="${jsr166y.jar}" index="true">      <jar destfile="${jsr166y.jar}" index="true">
931        <fileset dir="${build.jsr166y.classes.dir}"/>        <fileset dir="${build.jsr166y.classes.dir}"/>
932          <manifest>
933            <attribute name="Built-By" value="${user.name}"/>
934            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
935          </manifest>
936      </jar>      </jar>
937    
938    </target>    </target>
# Line 1001  Line 1021 
1021    
1022      <jar destfile="${extra166y.jar}" index="true">      <jar destfile="${extra166y.jar}" index="true">
1023        <fileset dir="${build.extra166y.classes.dir}"/>        <fileset dir="${build.extra166y.classes.dir}"/>
1024          <manifest>
1025            <attribute name="Built-By" value="${user.name}"/>
1026            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1027          </manifest>
1028      </jar>      </jar>
1029    
1030    </target>    </target>
# Line 1116  Line 1140 
1140    
1141      <jar destfile="${jsr166e.jar}" index="true">      <jar destfile="${jsr166e.jar}" index="true">
1142        <fileset dir="${build.jsr166e.classes.dir}"/>        <fileset dir="${build.jsr166e.classes.dir}"/>
1143          <manifest>
1144            <attribute name="Built-By" value="${user.name}"/>
1145            <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1146          </manifest>
1147      </jar>      </jar>
1148    
1149    </target>    </target>
# Line 1141  Line 1169 
1169    </target>    </target>
1170    
1171    
1172    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1173            depends="jsr166ejar">            depends="jsr166ejar">
1174    
1175      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1153  Line 1181 
1181        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1182    </target>    </target>
1183    
1184    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1185            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
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="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1190  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
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="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1196        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1197      </antcall>      </antcall>
1198    
1199      <antcall target="clean"/>      <antcall target="clean"/>
1200      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1201        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1202        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1203      </antcall>      </antcall>
# Line 1177  Line 1205 
1205    
1206    
1207    <target name="jsr166e-test"    <target name="jsr166e-test"
1208            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1209            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1210    </target>    </target>
1211    

Legend:
Removed from v.1.172  
changed lines
  Added in v.1.181

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