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.182 by jsr166, Sun Sep 13 17:46:07 2015 UTC vs.
Revision 1.186 by jsr166, Wed Sep 30 18:12:20 2015 UTC

# Line 57 | Line 57
57    <property name="build.deprecation"    value="false"/>
58    <property name="build.javadoc.access" value="protected"/>
59  
60  <!-- Tck options; see JSR166TestCase.java
61   To profile a single tck test class:
62   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
63   To stress test a single tck test class:
64   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
65  -->
66  <property name="jsr166.profileTests"     value="false"/>
67  <property name="jsr166.profileThreshold" value="100"/>
68  <property name="jsr166.runsPerTest"      value="1"/>
69  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
70
60    <!-- Build locations -->
61    <property name="build.dir"                   location="build"/>
62    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 205 | Line 194
194    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195             classpath="${lib.dir}/jtreg.jar" />
196  
197 <  <!-- Test classpath -->
198 <  <path id="test.classpath">
199 <    <pathelement location="${build.testcases.dir}"/>
200 <    <pathelement location="${junit.jar}"/>
201 <  </path>
202 <
197 >  <!-- Tck options; see JSR166TestCase.java
198 >   To profile a single tck test class:
199 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
200 >   To stress test a single tck test class:
201 >   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">
207      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
208      <attribute name="target"/>
# Line 261 | Line 253
253          <jvmarg line="@{jvmflags}"/>
254  
255          <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256 <        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
256 >        <syspropertyset id="system-properties-used-by-tck">
257            <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258 +          <propertyref prefix="jsr166."/>
259          </syspropertyset>
260  
268        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
269        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
270        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
261          <classpath>
262            <pathelement location="${junit.jar}"/>
263            <pathelement location="@{workdir}/tck-classes"/>
# Line 326 | Line 316
316        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
317        <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
318        <arg value="-agentvm"/>
319 <      <arg value="-v:nopass,fail"/>
319 >      <arg value="-verbose:nopass,fail,error"/>
320        <arg value="-vmoptions:-esa -ea"/>
321        <arg value="-automatic"/>
322        <arg value="-k:!ignore"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines