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.168 by jsr166, Wed Sep 2 02:14:59 2015 UTC vs.
Revision 1.177 by jsr166, Fri Sep 11 18:43:46 2015 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if" xmlns:unless="ant:unless">
3  
4    <description>
5   ------------------------------------------------------------------------------
# Line 38 | Line 39
39      </java>
40    </target>
41  
42 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
43  
44    <!-- User-specific settings -->
45    <property file="user.properties"/>
# Line 52 | Line 54
54  
55    <!-- Tck options; see JSR166TestCase.java
56     To profile a single tck test class:
57 <   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
57 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58     To stress test a single tck test class:
59 <   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
59 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60    -->
61    <property name="jsr166.profileTests"     value="false"/>
62    <property name="jsr166.profileThreshold" value="100"/>
# Line 93 | Line 95
95      <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96      <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97      <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"/>
98 >    <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"/>
105      <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
106      <path id="bootclasspath@{v}">
# Line 129 | Line 136
136    <property name="test.src.dir"         location="${basedir}/src/test"/>
137    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
138    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
139 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
139 >  <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"/>
144    <property name="dist.dir"             location="${basedir}/dist"/>
145    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 234 | Line 244
244          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
245          <jvmarg line="@{jvmflags}"/>
246  
247 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
247 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
248          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
249            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
250          </syspropertyset>
# Line 252 | Line 262
262    </macrodef>
263  
264    <!-- Define jtreg test sets for different jdk versions -->
265 <  <fileset dir="${jtreg.src.dir}">
265 >  <fileset dir="${jtreg9.src.dir}">
266      <patternset id="jdk9.jtreg.tests">
267        <include name="**/*.java"/>
268      </patternset>
269    </fileset>
270  
271 <  <fileset dir="${jtreg.src.dir}">
271 >  <fileset dir="${jtreg8.src.dir}">
272      <patternset id="jdk8.jtreg.tests">
273        <include name="**/*.java"/>
274 <      <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
274 >      <exclude name="**/SpliteratorCharacteristics.java"/>
275        <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
276 <      <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
276 >      <exclude name="**/GCDuringIteration.java"/>
277      </patternset>
278    </fileset>
279  
280 <  <fileset dir="${jtreg.src.dir}">
280 >  <fileset dir="${jtreg7.src.dir}">
281      <patternset id="jdk7.jtreg.tests">
282        <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"/>
283      </patternset>
284    </fileset>
285  
286    <macrodef name="run-jtreg-tests">
287 <    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
284 <    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
287 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
288      <attribute name="source" default="7"/>
289      <attribute name="target"/>
290      <attribute name="workdir"/>
# Line 292 | Line 295
295      <delete dir="@{workdir}/JTreport" quiet="true"/>
296      <mkdir dir="@{workdir}/JTwork/scratch"/>
297      <mkdir dir="@{workdir}/JTreport"/>
298 <    <jtreg dir="@{jtreg.src.dir}"
298 >    <jtreg dir="${jtreg@{target}.src.dir}"
299             jdk="${jdk@{target}.home}"
300             workDir="@{workdir}/JTwork"
301             reportDir="@{workdir}/JTreport">
# Line 451 | Line 454
454      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
455    </target>
456  
457 <  <target name="tck" depends="test-tck" description="alias for test-tck"/>
455 <  <target name="test-tck"
457 >  <target name="tck"
458            depends="jar"
459            description="Runs tck tests for main directly">
460  
# Line 462 | Line 464
464        classes="${product.jar}"/>
465    </target>
466  
467 <  <target name="test-tck-parallelism-1"
468 <          description="Runs test-tck with given common pool parallelism">
469 <    <antcall target="test-tck">
467 >  <target name="tck-parallelism-1"
468 >          description="Runs tck with given common pool parallelism">
469 >    <antcall target="tck">
470        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
471      </antcall>
472    </target>
473  
474 <  <target name="test-tck-parallelism-0"
475 <          description="Runs test-tck with given common pool parallelism">
476 <    <antcall target="test-tck">
474 >  <target name="tck-parallelism-0"
475 >          description="Runs tck with given common pool parallelism">
476 >    <antcall target="tck">
477        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
478      </antcall>
479    </target>
480  
481 <  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
480 <  <target name="test-jtreg"
481 >  <target name="jtreg"
482            depends="jar"
483            description="Runs jtreg tests for main using the jtreg ant task">
484      <run-jtreg-tests
# Line 487 | Line 488
488    </target>
489  
490    <target name="test"
491 <          depends="test-tck, test-tck-parallelism-1, test-jtreg"
491 >          depends="tck, tck-parallelism-1, jtreg"
492            description="Runs tck and jtreg tests for main">
493    </target>
494  
# Line 664 | Line 665
665    </target>
666  
667  
668 <  <target name="4jdk7-test-tck"
668 >  <target name="4jdk7-tck"
669            depends="4jdk7jar"
670            description="Runs tck tests for jsr166-4jdk7 directly">
671  
# Line 676 | Line 677
677          <!-- JDK8+ test classes -->
678          <exclude name="*8Test.java"/>
679          <exclude name="*9Test.java"/>
680 +        <exclude name="*10Test.java"/>
681          <exclude name="DoubleAccumulatorTest.java"/>
682          <exclude name="DoubleAdderTest.java"/>
683          <exclude name="LongAccumulatorTest.java"/>
# Line 683 | Line 685
685          <exclude name="CompletableFutureTest.java"/>
686          <exclude name="SplittableRandomTest.java"/>
687          <exclude name="StampedLockTest.java"/>
688 +        <exclude name="SubmissionPublisherTest.java"/>
689        </javac-elements>
690      </run-tck-tests>
691    </target>
692  
693  
694 <  <target name="4jdk7-test-tck-junit"
694 >  <target name="4jdk7-tck-junit"
695            depends="4jdk7compile"
696            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
697  
# Line 716 | Line 719
719      </junit>
720    </target>
721  
722 <  <target name="4jdk7-test-jtreg"
722 >  <target name="4jdk7-jtreg"
723            depends="4jdk7jar"
724            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
725      <run-jtreg-tests
# Line 727 | Line 730
730  
731  
732    <target name="4jdk7-test"
733 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
733 >          depends="4jdk7-tck, 4jdk7-jtreg"
734            description="Runs tck and jtreg tests for jsr166-4jdk7">
735    </target>
736  
# Line 1132 | Line 1135
1135    </target>
1136  
1137  
1138 <  <target name="jsr166e-test-tck-one-java-version"
1138 >  <target name="jsr166e-tck-one-java-version"
1139            depends="jsr166ejar">
1140  
1141      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1144 | Line 1147
1147        classes="${jsr166e.jar}"/>
1148    </target>
1149  
1150 <  <target name="jsr166e-test-tck"
1150 >  <target name="jsr166e-tck"
1151            description="Runs tck tests for jsr166e for multiple java versions">
1152  
1153   <!--     <antcall target="clean"/> -->
1154 < <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1154 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1155   <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1156   <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1157   <!--     </antcall> -->
1158  
1159      <antcall target="clean"/>
1160 <    <antcall target="jsr166e-test-tck-one-java-version">
1160 >    <antcall target="jsr166e-tck-one-java-version">
1161        <param name="build.jsr166e.java.version" value="7"/>
1162        <param name="build.jsr166e.javac" value="${javac7}"/>
1163      </antcall>
1164  
1165      <antcall target="clean"/>
1166 <    <antcall target="jsr166e-test-tck-one-java-version">
1166 >    <antcall target="jsr166e-tck-one-java-version">
1167        <param name="build.jsr166e.java.version" value="6"/>
1168        <param name="build.jsr166e.javac" value="${javac6}"/>
1169      </antcall>
# Line 1168 | Line 1171
1171  
1172  
1173    <target name="jsr166e-test"
1174 <          depends="jsr166e-test-tck"
1174 >          depends="jsr166e-tck"
1175            description="Runs all tests for jsr166e">
1176    </target>
1177  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines