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.173 by jsr166, Thu Sep 3 01:24:31 2015 UTC vs.
Revision 1.174 by jsr166, Thu Sep 3 01:38:44 2015 UTC

# Line 52 | Line 52
52  
53    <!-- Tck options; see JSR166TestCase.java
54     To profile a single tck test class:
55 <   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
55 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest tck
56     To stress test a single tck test class:
57 <   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
57 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
58    -->
59    <property name="jsr166.profileTests"     value="false"/>
60    <property name="jsr166.profileThreshold" value="100"/>
# Line 237 | Line 237
237          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
238          <jvmarg line="@{jvmflags}"/>
239  
240 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
240 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
241          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
242            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
243          </syspropertyset>
# Line 277 | Line 277
277    </fileset>
278  
279    <macrodef name="run-jtreg-tests">
280 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
280 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
281      <attribute name="source" default="7"/>
282      <attribute name="target"/>
283      <attribute name="workdir"/>
# Line 447 | Line 447
447      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
448    </target>
449  
450 <  <target name="tck" depends="test-tck" description="alias for test-tck"/>
451 <  <target name="test-tck"
450 >  <target name="tck"
451            depends="jar"
452            description="Runs tck tests for main directly">
453  
# Line 458 | Line 457
457        classes="${product.jar}"/>
458    </target>
459  
460 <  <target name="test-tck-parallelism-1"
461 <          description="Runs test-tck with given common pool parallelism">
462 <    <antcall target="test-tck">
460 >  <target name="tck-parallelism-1"
461 >          description="Runs tck with given common pool parallelism">
462 >    <antcall target="tck">
463        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
464      </antcall>
465    </target>
466  
467 <  <target name="test-tck-parallelism-0"
468 <          description="Runs test-tck with given common pool parallelism">
469 <    <antcall target="test-tck">
467 >  <target name="tck-parallelism-0"
468 >          description="Runs tck with given common pool parallelism">
469 >    <antcall target="tck">
470        <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
471      </antcall>
472    </target>
473  
474 <  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
476 <  <target name="test-jtreg"
474 >  <target name="jtreg"
475            depends="jar"
476            description="Runs jtreg tests for main using the jtreg ant task">
477      <run-jtreg-tests
# Line 483 | Line 481
481    </target>
482  
483    <target name="test"
484 <          depends="test-tck, test-tck-parallelism-1, test-jtreg"
484 >          depends="tck, tck-parallelism-1, jtreg"
485            description="Runs tck and jtreg tests for main">
486    </target>
487  
# Line 660 | Line 658
658    </target>
659  
660  
661 <  <target name="4jdk7-test-tck"
661 >  <target name="4jdk7-tck"
662            depends="4jdk7jar"
663            description="Runs tck tests for jsr166-4jdk7 directly">
664  
# Line 684 | Line 682
682    </target>
683  
684  
685 <  <target name="4jdk7-test-tck-junit"
685 >  <target name="4jdk7-tck-junit"
686            depends="4jdk7compile"
687            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
688  
# Line 712 | Line 710
710      </junit>
711    </target>
712  
713 <  <target name="4jdk7-test-jtreg"
713 >  <target name="4jdk7-jtreg"
714            depends="4jdk7jar"
715            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
716      <run-jtreg-tests
# Line 723 | Line 721
721  
722  
723    <target name="4jdk7-test"
724 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
724 >          depends="4jdk7-tck, 4jdk7-jtreg"
725            description="Runs tck and jtreg tests for jsr166-4jdk7">
726    </target>
727  
# Line 1128 | Line 1126
1126    </target>
1127  
1128  
1129 <  <target name="jsr166e-test-tck-one-java-version"
1129 >  <target name="jsr166e-tck-one-java-version"
1130            depends="jsr166ejar">
1131  
1132      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1140 | Line 1138
1138        classes="${jsr166e.jar}"/>
1139    </target>
1140  
1141 <  <target name="jsr166e-test-tck"
1141 >  <target name="jsr166e-tck"
1142            description="Runs tck tests for jsr166e for multiple java versions">
1143  
1144   <!--     <antcall target="clean"/> -->
1145 < <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1145 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1146   <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1147   <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1148   <!--     </antcall> -->
1149  
1150      <antcall target="clean"/>
1151 <    <antcall target="jsr166e-test-tck-one-java-version">
1151 >    <antcall target="jsr166e-tck-one-java-version">
1152        <param name="build.jsr166e.java.version" value="7"/>
1153        <param name="build.jsr166e.javac" value="${javac7}"/>
1154      </antcall>
1155  
1156      <antcall target="clean"/>
1157 <    <antcall target="jsr166e-test-tck-one-java-version">
1157 >    <antcall target="jsr166e-tck-one-java-version">
1158        <param name="build.jsr166e.java.version" value="6"/>
1159        <param name="build.jsr166e.javac" value="${javac6}"/>
1160      </antcall>
# Line 1164 | Line 1162
1162  
1163  
1164    <target name="jsr166e-test"
1165 <          depends="jsr166e-test-tck"
1165 >          depends="jsr166e-tck"
1166            description="Runs all tests for jsr166e">
1167    </target>
1168  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines