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.180 by jsr166, Sun Sep 13 03:41:53 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 362 | Line 365
365  
366      <jar destfile="${product.jar}">
367        <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>
373    </target>
374  
# Line 420 | Line 427
427        <exclude name="src/emulation/**"/>
428        <exclude name="**/SyntaxTest.java"/>
429        <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>
435    </target>
436  
# Line 451 | Line 462
462      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
463    </target>
464  
465 <  <target name="tck" depends="test-tck" description="alias for test-tck"/>
455 <  <target name="test-tck"
465 >  <target name="tck"
466            depends="jar"
467            description="Runs tck tests for main directly">
468  
# Line 462 | Line 472
472        classes="${product.jar}"/>
473    </target>
474  
475 <  <target name="test-tck-parallelism-1"
476 <          description="Runs test-tck with given common pool parallelism">
477 <    <antcall target="test-tck">
475 >  <target name="tck-parallelism-1"
476 >          description="Runs tck with given common pool parallelism">
477 >    <antcall target="tck">
478        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
479      </antcall>
480    </target>
481  
482 <  <target name="test-tck-parallelism-0"
483 <          description="Runs test-tck with given common pool parallelism">
484 <    <antcall target="test-tck">
482 >  <target name="tck-parallelism-0"
483 >          description="Runs tck with given common pool parallelism">
484 >    <antcall target="tck">
485        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
486      </antcall>
487    </target>
488  
489 <  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
480 <  <target name="test-jtreg"
489 >  <target name="jtreg"
490            depends="jar"
491            description="Runs jtreg tests for main using the jtreg ant task">
492      <run-jtreg-tests
# Line 487 | Line 496
496    </target>
497  
498    <target name="test"
499 <          depends="test-tck, test-tck-parallelism-1, test-jtreg"
499 >          depends="tck, tck-parallelism-1, jtreg"
500            description="Runs tck and jtreg tests for main">
501    </target>
502  
# Line 520 | Line 529
529  
530  
531    <target name="configure-compiler">
532 +    <fail message="ant version too old">
533 +      <condition>
534 +        <not> <antversion atleast="1.9.1"/> </not>
535 +      </condition>
536 +    </fail>
537  
538      <property name="unchecked.option" value="-Xlint:unchecked"/>
539  
# Line 659 | Line 673
673  
674      <jar destfile="${4jdk7product.jar}">
675        <fileset dir="${build.4jdk7.classes.dir}"/>
676 +      <manifest>
677 +        <attribute name="Built-By" value="${user.name}"/>
678 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
679 +      </manifest>
680      </jar>
681  
682    </target>
683  
684  
685 <  <target name="4jdk7-test-tck"
685 >  <target name="4jdk7-tck"
686            depends="4jdk7jar"
687            description="Runs tck tests for jsr166-4jdk7 directly">
688  
# Line 676 | Line 694
694          <!-- JDK8+ test classes -->
695          <exclude name="*8Test.java"/>
696          <exclude name="*9Test.java"/>
697 +        <exclude name="*10Test.java"/>
698          <exclude name="DoubleAccumulatorTest.java"/>
699          <exclude name="DoubleAdderTest.java"/>
700          <exclude name="LongAccumulatorTest.java"/>
# Line 683 | Line 702
702          <exclude name="CompletableFutureTest.java"/>
703          <exclude name="SplittableRandomTest.java"/>
704          <exclude name="StampedLockTest.java"/>
705 +        <exclude name="SubmissionPublisherTest.java"/>
706        </javac-elements>
707      </run-tck-tests>
708    </target>
709  
710  
711 <  <target name="4jdk7-test-tck-junit"
711 >  <target name="4jdk7-tck-junit"
712            depends="4jdk7compile"
713            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
714  
# Line 716 | Line 736
736      </junit>
737    </target>
738  
739 <  <target name="4jdk7-test-jtreg"
739 >  <target name="4jdk7-jtreg"
740            depends="4jdk7jar"
741            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
742      <run-jtreg-tests
# Line 727 | Line 747
747  
748  
749    <target name="4jdk7-test"
750 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
750 >          depends="4jdk7-tck, 4jdk7-jtreg"
751            description="Runs tck and jtreg tests for jsr166-4jdk7">
752    </target>
753  
# Line 817 | Line 837
837  
838      <jar destfile="${jsr166x.jar}">
839        <fileset dir="${build.jsr166x.classes.dir}"/>
840 +      <manifest>
841 +        <attribute name="Built-By" value="${user.name}"/>
842 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
843 +      </manifest>
844      </jar>
845  
846    </target>
# Line 904 | Line 928
928  
929      <jar destfile="${jsr166y.jar}" index="true">
930        <fileset dir="${build.jsr166y.classes.dir}"/>
931 +      <manifest>
932 +        <attribute name="Built-By" value="${user.name}"/>
933 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
934 +      </manifest>
935      </jar>
936  
937    </target>
# Line 992 | Line 1020
1020  
1021      <jar destfile="${extra166y.jar}" index="true">
1022        <fileset dir="${build.extra166y.classes.dir}"/>
1023 +      <manifest>
1024 +        <attribute name="Built-By" value="${user.name}"/>
1025 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1026 +      </manifest>
1027      </jar>
1028  
1029    </target>
# Line 1107 | Line 1139
1139  
1140      <jar destfile="${jsr166e.jar}" index="true">
1141        <fileset dir="${build.jsr166e.classes.dir}"/>
1142 +      <manifest>
1143 +        <attribute name="Built-By" value="${user.name}"/>
1144 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1145 +      </manifest>
1146      </jar>
1147  
1148    </target>
# Line 1132 | Line 1168
1168    </target>
1169  
1170  
1171 <  <target name="jsr166e-test-tck-one-java-version"
1171 >  <target name="jsr166e-tck-one-java-version"
1172            depends="jsr166ejar">
1173  
1174      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1144 | Line 1180
1180        classes="${jsr166e.jar}"/>
1181    </target>
1182  
1183 <  <target name="jsr166e-test-tck"
1183 >  <target name="jsr166e-tck"
1184            description="Runs tck tests for jsr166e for multiple java versions">
1185  
1186   <!--     <antcall target="clean"/> -->
1187 < <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1187 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1188   <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1189   <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1190   <!--     </antcall> -->
1191  
1192      <antcall target="clean"/>
1193 <    <antcall target="jsr166e-test-tck-one-java-version">
1193 >    <antcall target="jsr166e-tck-one-java-version">
1194        <param name="build.jsr166e.java.version" value="7"/>
1195        <param name="build.jsr166e.javac" value="${javac7}"/>
1196      </antcall>
1197  
1198      <antcall target="clean"/>
1199 <    <antcall target="jsr166e-test-tck-one-java-version">
1199 >    <antcall target="jsr166e-tck-one-java-version">
1200        <param name="build.jsr166e.java.version" value="6"/>
1201        <param name="build.jsr166e.javac" value="${javac6}"/>
1202      </antcall>
# Line 1168 | Line 1204
1204  
1205  
1206    <target name="jsr166e-test"
1207 <          depends="jsr166e-test-tck"
1207 >          depends="jsr166e-tck"
1208            description="Runs all tests for jsr166e">
1209    </target>
1210  

Diff Legend

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