[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.173, Thu Sep 3 01:24:31 2015 UTC revision 1.174, Thu Sep 3 01:38:44 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=100 -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 237  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 277  Line 277 
277    </fileset>    </fileset>
278    
279    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
280      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
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 447  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 458  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 483  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    
# Line 660  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 684  Line 682 
682    </target>    </target>
683    
684    
685    <target name="4jdk7-test-tck-junit"    <target name="4jdk7-tck-junit"
686            depends="4jdk7compile"            depends="4jdk7compile"
687            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">            description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
688    
# Line 712  Line 710 
710      </junit>      </junit>
711    </target>    </target>
712    
713    <target name="4jdk7-test-jtreg"    <target name="4jdk7-jtreg"
714            depends="4jdk7jar"            depends="4jdk7jar"
715            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
716      <run-jtreg-tests      <run-jtreg-tests
# Line 723  Line 721 
721    
722    
723    <target name="4jdk7-test"    <target name="4jdk7-test"
724            depends="4jdk7-test-tck, 4jdk7-test-jtreg"            depends="4jdk7-tck, 4jdk7-jtreg"
725            description="Runs tck and jtreg tests for jsr166-4jdk7">            description="Runs tck and jtreg tests for jsr166-4jdk7">
726    </target>    </target>
727    
# Line 1128  Line 1126 
1126    </target>    </target>
1127    
1128    
1129    <target name="jsr166e-test-tck-one-java-version"    <target name="jsr166e-tck-one-java-version"
1130            depends="jsr166ejar">            depends="jsr166ejar">
1131    
1132      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>      <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
# Line 1140  Line 1138 
1138        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1139    </target>    </target>
1140    
1141    <target name="jsr166e-test-tck"    <target name="jsr166e-tck"
1142            description="Runs tck tests for jsr166e for multiple java versions">            description="Runs tck tests for jsr166e for multiple java versions">
1143    
1144  <!--     <antcall target="clean"/> -->  <!--     <antcall target="clean"/> -->
1145  <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->  <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1146  <!--       <param name="build.jsr166e.java.version" value="8"/> -->  <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1147  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->  <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1148  <!--     </antcall> -->  <!--     </antcall> -->
1149    
1150      <antcall target="clean"/>      <antcall target="clean"/>
1151      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1152        <param name="build.jsr166e.java.version" value="7"/>        <param name="build.jsr166e.java.version" value="7"/>
1153        <param name="build.jsr166e.javac" value="${javac7}"/>        <param name="build.jsr166e.javac" value="${javac7}"/>
1154      </antcall>      </antcall>
1155    
1156      <antcall target="clean"/>      <antcall target="clean"/>
1157      <antcall target="jsr166e-test-tck-one-java-version">      <antcall target="jsr166e-tck-one-java-version">
1158        <param name="build.jsr166e.java.version" value="6"/>        <param name="build.jsr166e.java.version" value="6"/>
1159        <param name="build.jsr166e.javac" value="${javac6}"/>        <param name="build.jsr166e.javac" value="${javac6}"/>
1160      </antcall>      </antcall>
# Line 1164  Line 1162 
1162    
1163    
1164    <target name="jsr166e-test"    <target name="jsr166e-test"
1165            depends="jsr166e-test-tck"            depends="jsr166e-tck"
1166            description="Runs all tests for jsr166e">            description="Runs all tests for jsr166e">
1167    </target>    </target>
1168    

Legend:
Removed from v.1.173  
changed lines
  Added in v.1.174

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8