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

Diff of /jsr166/build.xml

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

revision 1.182 by jsr166, Sun Sep 13 17:46:07 2015 UTC revision 1.190 by jsr166, Thu Nov 5 17:18:53 2015 UTC
# Line 57  Line 57 
57    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
58    <property name="build.javadoc.access" value="protected"/>    <property name="build.javadoc.access" value="protected"/>
59    
   <!-- Tck options; see JSR166TestCase.java  
    To profile a single tck test class:  
    ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck  
    To stress test a single tck test class:  
    ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck  
   -->  
   <property name="jsr166.profileTests"     value="false"/>  
   <property name="jsr166.profileThreshold" value="100"/>  
   <property name="jsr166.runsPerTest"      value="1"/>  
   <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>  
   
60    <!-- Build locations -->    <!-- Build locations -->
61    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
62    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 205  Line 194 
194    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
196    
197    <!-- Test classpath -->    <!-- Tck options; see JSR166TestCase.java
198    <path id="test.classpath">     To profile a single tck test class:
199      <pathelement location="${build.testcases.dir}"/>     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
200      <pathelement location="${junit.jar}"/>     To stress test a single tck test class:
201    </path>     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
202       To stress test a single tck test method:
203       ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
204      -->
205      <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
206    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
207      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
208      <attribute name="target"/>      <attribute name="target"/>
# Line 244  Line 236 
236    
237        <include name="*.java"/>        <include name="*.java"/>
238        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
239        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241        <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
242        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 261  Line 253 
253          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
254    
255          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256          <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">          <syspropertyset id="system-properties-used-by-tck">
257            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258              <propertyref prefix="jsr166."/>
259          </syspropertyset>          </syspropertyset>
260    
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>  
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>  
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>  
261          <classpath>          <classpath>
262            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
263            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 309  Line 299 
299    
300      <sequential>      <sequential>
301    
302        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
303        <property name="jtreg.verbose" value="nopass,fail,error"/>
304    
305      <local name="modules"/>      <local name="modules"/>
306      <condition property="modules">      <condition property="modules">
307        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/jmods" type="dir"/>
# Line 326  Line 319 
319        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
320        <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
321        <arg value="-agentvm"/>        <arg value="-agentvm"/>
322        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
323        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
324        <arg value="-automatic"/>        <arg value="-automatic"/>
325        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
# Line 658  Line 651 
651             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
652             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
653             source="6"             source="6"
654               target="6"
655             classpath=""             classpath=""
656             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
657             includeAntRuntime="false"             includeAntRuntime="false"
# Line 687  Line 681 
681             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
682             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
683             source="6"             source="6"
684               target="6"
685             classpath=""             classpath=""
686             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
687             includeAntRuntime="false"             includeAntRuntime="false"
688             includeJavaRuntime="false"             includeJavaRuntime="false"
689             executable="${javac8}"             executable="${javac8}"
# Line 854  Line 849 
849             classpath=""             classpath=""
850             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
851             source="5"             source="5"
852               target="5"
853             includeAntRuntime="false"             includeAntRuntime="false"
854             includeJavaRuntime="false"             includeJavaRuntime="false"
855             executable="${javac7}"             executable="${javac7}"
# Line 943  Line 939 
939             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
940             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
941             source="6"             source="6"
942               target="6"
943             classpath=""             classpath=""
944             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
945             includeAntRuntime="false"             includeAntRuntime="false"
# Line 1037  Line 1034 
1034             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1035             classpath=""             classpath=""
1036             source="6"             source="6"
1037               target="6"
1038             includeAntRuntime="false"             includeAntRuntime="false"
1039             includeJavaRuntime="false"             includeJavaRuntime="false"
1040             executable="${javac7}"             executable="${javac7}"
# Line 1128  Line 1126 
1126             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1127             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1128             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1129               target="${build.jsr166e.java.version}"
1130             classpath=""             classpath=""
1131             includeAntRuntime="false"             includeAntRuntime="false"
1132             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1154  Line 1153 
1153             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1154             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1155             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1156               target="${build.jsr166e.java.version}"
1157             classpath=""             classpath=""
1158             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1159             includeAntRuntime="false"             includeAntRuntime="false"
1160             includeJavaRuntime="false"             includeJavaRuntime="false"
1161             executable="${javac8}"             executable="${javac8}"

Legend:
Removed from v.1.182  
changed lines
  Added in v.1.190

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27