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

Diff of /jsr166/build.xml

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

revision 1.164, Wed May 20 06:13:09 2015 UTC revision 1.176, Tue Sep 8 16:54:43 2015 UTC
# Line 52  Line 52 
52    
53    <!-- Tck options; see JSR166TestCase.java    <!-- Tck options; see JSR166TestCase.java
54     To profile a single tck test class:     To profile a single tck test class:
55     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
56     To stress test a single tck test class:     To stress test a single tck test class:
57     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
58    -->    -->
59    <property name="jsr166.profileTests"     value="false"/>    <property name="jsr166.profileTests"     value="false"/>
60    <property name="jsr166.profileThreshold" value="100"/>    <property name="jsr166.profileThreshold" value="100"/>
# Line 129  Line 129 
129    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
130    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
131    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
132    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
133      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
134      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
135      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
136    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
137    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
138    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 234  Line 237 
237          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
238          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
239    
240          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
241          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
242            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
243          </syspropertyset>          </syspropertyset>
# Line 251  Line 254 
254      </sequential>      </sequential>
255    </macrodef>    </macrodef>
256    
257      <!-- Define jtreg test sets for different jdk versions -->
258      <fileset dir="${jtreg9.src.dir}">
259        <patternset id="jdk9.jtreg.tests">
260          <include name="**/*.java"/>
261        </patternset>
262      </fileset>
263    
264      <fileset dir="${jtreg8.src.dir}">
265        <patternset id="jdk8.jtreg.tests">
266          <include name="**/*.java"/>
267          <exclude name="**/SpliteratorCharacteristics.java"/>
268          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
269          <exclude name="**/GCDuringIteration.java"/>
270        </patternset>
271      </fileset>
272    
273      <fileset dir="${jtreg7.src.dir}">
274        <patternset id="jdk7.jtreg.tests">
275          <include name="**/*.java"/>
276        </patternset>
277      </fileset>
278    
279    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
280      <!-- 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}"/>  
281      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
282      <attribute name="target"/>      <attribute name="target"/>
283      <attribute name="workdir"/>      <attribute name="workdir"/>
# Line 264  Line 288 
288      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
289      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
290      <mkdir dir="@{workdir}/JTreport"/>      <mkdir dir="@{workdir}/JTreport"/>
291      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
292             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
293             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
294             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
295          <patternset refid="jdk@{target}.jtreg.tests"/>
296        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
297        <arg value="-agentvm"/>        <arg value="-agentvm"/>
298        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 423  Line 447 
447      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
448    </target>    </target>
449    
450    <target name="tck" depends="test-tck" description="alias for test-tck"/>    <target name="tck"
   <target name="test-tck"  
451            depends="jar"            depends="jar"
452            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
453    
# Line 434  Line 457 
457        classes="${product.jar}"/>        classes="${product.jar}"/>
458    </target>    </target>
459    
460    <target name="test-tck-parallelism-1"    <target name="tck-parallelism-1"
461            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
462      <antcall target="test-tck">      <antcall target="tck">
463        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
464      </antcall>      </antcall>
465    </target>    </target>
466    
467    <target name="test-tck-parallelism-0"    <target name="tck-parallelism-0"
468            description="Runs test-tck with given common pool parallelism">            description="Runs tck with given common pool parallelism">
469      <antcall target="test-tck">      <antcall target="tck">
470        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
471      </antcall>      </antcall>
472    </target>    </target>
473    
474    <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>    <target name="jtreg"
   <target name="test-jtreg"  
475            depends="jar"            depends="jar"
476            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
477      <run-jtreg-tests      <run-jtreg-tests
# Line 459  Line 481 
481    </target>    </target>
482    
483    <target name="test"    <target name="test"
484            depends="test-tck, test-tck-parallelism-1, test-jtreg"            depends="tck, tck-parallelism-1, jtreg"
485            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
486    </target>    </target>
487    
488      <target name="jtreg8" description="Runs jtreg tests with jdk8">
489    
490        <antcall target="jtreg">
491          <param name="build.main.java.version" value="8"/>
492          <param name="build.main.javac" value="${javac8}"/>
493        </antcall>
494    
495      </target>
496    
497    <target name="test89"    <target name="test89"
498            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
499    
# Line 529  Line 560 
560    </target>    </target>
561    
562    
563      <target name="compile-test-loops" depends="jar"
564              description="compile all the perf tests in src/test/loops">
565    
566        <mkdir dir="${build.dir}/test/loops"/>
567    
568        <javac srcdir="${basedir}/src/test/loops"
569               destdir="${build.dir}/test/loops"
570               debug="${build.debug}"
571               debuglevel="${build.debuglevel}"
572               deprecation="${build.deprecation}"
573               includeAntRuntime="false"
574               includeJavaRuntime="false"
575               executable="${javac9}"
576               fork="true">
577    
578          <include name="*.java"/>
579          <compilerarg value="-XDignore.symbol.file=true"/>
580          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
581          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
582          <compilerarg line="${build.args}"/>
583    
584        </javac>
585    
586      </target>
587    
588    
589    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
590    
591    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 601  Line 658 
658    </target>    </target>
659    
660    
661    <target name="4jdk7-test-tck"    <target name="4jdk7-tck"
662            depends="4jdk7jar"            depends="4jdk7jar"
663            description="Runs tck tests for jsr166-4jdk7 directly">            description="Runs tck tests for jsr166-4jdk7 directly">
664    
# Line 613  Line 670 
670          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
671          <exclude name="*8Test.java"/>          <exclude name="*8Test.java"/>
672          <exclude name="*9Test.java"/>          <exclude name="*9Test.java"/>
673            <exclude name="*10Test.java"/>
674          <exclude name="DoubleAccumulatorTest.java"/>          <exclude name="DoubleAccumulatorTest.java"/>
675          <exclude name="DoubleAdderTest.java"/>          <exclude name="DoubleAdderTest.java"/>
676          <exclude name="LongAccumulatorTest.java"/>          <exclude name="LongAccumulatorTest.java"/>
# Line 620  Line 678 
678          <exclude name="CompletableFutureTest.java"/>          <exclude name="CompletableFutureTest.java"/>
679          <exclude name="SplittableRandomTest.java"/>          <exclude name="SplittableRandomTest.java"/>
680          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
681            <exclude name="SubmissionPublisherTest.java"/>
682        </javac-elements>        </javac-elements>
683      </run-tck-tests>      </run-tck-tests>
684    </target>    </target>
685    
686    
687    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
688            depends="4jdk7compile"            depends="4jdk7compile"
689            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
690    
# Line 653  Line 712 
712      </junit>      </junit>
713    </target>    </target>
714    
715    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
716            depends="4jdk7jar"            depends="4jdk7jar"
717            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
718      <run-jtreg-tests      <run-jtreg-tests
719         target="7"         target="7"
720         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
721         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
722    </target>    </target>
723    
724    
725    <target name="4jdk7-test"    <target name="4jdk7-test"
726            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
727            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
728    </target>    </target>
729    
# Line 1070  Line 1128 
1128    </target>    </target>
1129    
1130    
1131    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1132            depends="jsr166ejar">            depends="jsr166ejar">
1133    
1134      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1082  Line 1140 
1140        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1141    </target>    </target>
1142    
1143    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1144            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1145    
1146  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1147  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1148  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1149  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1150  <!--     </antcall> -->  <!--     </antcall> -->
1151    
1152      <antcall target="clean"/>      <antcall target="clean"/>
1153      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1154        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1155        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1156      </antcall>      </antcall>
1157    
1158      <antcall target="clean"/>      <antcall target="clean"/>
1159      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1160        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1161        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1162      </antcall>      </antcall>
# Line 1106  Line 1164 
1164    
1165    
1166    <target name="jsr166e-test"    <target name="jsr166e-test"
1167            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1168            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1169    </target>    </target>
1170    

Legend:
Removed from v.1.164  
changed lines
  Added in v.1.176

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8