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.157 by jsr166, Tue Jul 8 00:01:39 2014 UTC vs.
Revision 1.161 by jsr166, Sat Jan 17 23:12:49 2015 UTC

# Line 24 | Line 24
24    $HOME/jdk/src/jdk9
25    where each of the above is a complete JDK source tree
26    (e.g. mercurial forest) or a symlink to same.
27 +
28 +  Alternatively, define ant variables thus:
29 +  ant -Djdk$N.home=...
30 +  for $N in 6 7 8 9 ...
31   ------------------------------------------------------------------------------
32    </description>
33  
# Line 47 | Line 51
51    <property name="build.javadoc.access" value="protected"/>
52  
53    <!-- Tck options; see JSR166TestCase.java
54 <   Profiling a tck test class:
54 >   To profile a single tck test class:
55     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56 <   Stress test a tck test class:
56 >   To stress test a single tck test class:
57     ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58    -->
59    <property name="jsr166.profileTests"     value="false"/>
60    <property name="jsr166.profileThreshold" value="100"/>
61    <property name="jsr166.runsPerTest"      value="1"/>
58  <!-- Stress test an individual tck test class:
59  ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
60  -->
62    <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63  
64    <!-- Build locations -->
# Line 232 | Line 233
233            fork="true">
234          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
235          <jvmarg line="@{jvmflags}"/>
236 +
237 +        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238 +        <syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239 +          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240 +        </syspropertyset>
241 +
242          <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243          <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244          <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
# Line 426 | Line 433
433        classes="${product.jar}"/>
434    </target>
435  
436 +  <target name="test-tck-parallelism-1"
437 +          description="Runs test-tck with given common pool parallelism">
438 +    <antcall target="test-tck">
439 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
440 +    </antcall>
441 +  </target>
442 +
443 +  <target name="test-tck-parallelism-0"
444 +          description="Runs test-tck with given common pool parallelism">
445 +    <antcall target="test-tck">
446 +      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
447 +    </antcall>
448 +  </target>
449 +
450    <target name="test-jtreg"
451            depends="jar"
452            description="Runs jtreg tests for main using the jtreg ant task">
# Line 436 | Line 457
457    </target>
458  
459    <target name="test"
460 <          depends="test-tck, test-jtreg"
460 >          depends="test-tck, test-tck-parallelism-1, test-jtreg"
461            description="Runs tck and jtreg tests for main">
462    </target>
463  
# Line 1107 | Line 1128
1128  
1129    <target name="lint">
1130      <antcall target="dists">
1131 +      <param name="build.javadoc.access" value="public"/>
1132 +    </antcall>
1133 +  </target>
1134 +
1135 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1136 +  <target name="lint-private">
1137 +    <antcall target="dist">
1138        <param name="build.javadoc.access" value="private"/>
1139      </antcall>
1140    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines