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.158 by jsr166, Sat Jul 12 17:29:12 2014 UTC vs.
Revision 1.163 by jsr166, Fri Feb 20 22:33:13 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 209 | Line 213
213             source="@{compile-target}"
214             target="@{compile-target}"
215             classpath="${junit.jar}"
212           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
216             includeAntRuntime="false"
217             includeJavaRuntime="false"
218             executable="${javac@{compile-target}}"
# Line 218 | Line 221
221        <include name="*.java"/>
222        <compilerarg value="-XDignore.symbol.file=true"/>
223        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224 +      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
225        <compilerarg line="${build.args}"/>
226        <javac-elements/>
227  
# Line 229 | 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 412 | Line 422
422      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
423    </target>
424  
425 <
425 >  <target name="tck" depends="test-tck" description="alias for test-tck"/>
426    <target name="test-tck"
427            depends="jar"
428            description="Runs tck tests for main directly">
# Line 423 | 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="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
451    <target name="test-jtreg"
452            depends="jar"
453            description="Runs jtreg tests for main using the jtreg ant task">
# Line 433 | Line 458
458    </target>
459  
460    <target name="test"
461 <          depends="test-tck, test-jtreg"
461 >          depends="test-tck, test-tck-parallelism-1, test-jtreg"
462            description="Runs tck and jtreg tests for main">
463    </target>
464  
# Line 1104 | Line 1129
1129  
1130    <target name="lint">
1131      <antcall target="dists">
1132 +      <param name="build.javadoc.access" value="public"/>
1133 +    </antcall>
1134 +  </target>
1135 +
1136 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1137 +  <target name="lint-private">
1138 +    <antcall target="dist">
1139        <param name="build.javadoc.access" value="private"/>
1140      </antcall>
1141    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines