--- jsr166/build.xml	2014/02/16 14:25:46	1.151
+++ jsr166/build.xml	2015/09/02 04:46:40	1.171
@@ -24,6 +24,10 @@
   $HOME/jdk/src/jdk9
   where each of the above is a complete JDK source tree
   (e.g. mercurial forest) or a symlink to same.
+
+  Alternatively, define ant variables thus:
+  ant -Djdk$N.home=...
+  for $N in 6 7 8 9 ...
 ------------------------------------------------------------------------------
   </description>
 
@@ -46,13 +50,15 @@
   <property name="build.deprecation"    value="false"/>
   <property name="build.javadoc.access" value="protected"/>
 
-  <!-- Tck options; see JSR166TestCase.java -->
-  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
+  <!-- Tck options; see JSR166TestCase.java
+   To profile a single tck test class:
+   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
+   To stress test a single tck test class:
+   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
+  -->
   <property name="jsr166.profileTests"     value="false"/>
   <property name="jsr166.profileThreshold" value="100"/>
   <property name="jsr166.runsPerTest"      value="1"/>
-  <!-- Allow running an individual tck test class -->
-  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
   <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
 
   <!-- Build locations -->
@@ -157,21 +163,24 @@
   <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
   <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
 
-  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
-  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
-  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
-  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
-
-  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
-  <!-- The expected canonical location does not yet exist as of 2014-02 -->
-  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
-
-  <property name="jdkapi9docs.url"      value="${jdkapi8docs.url}"/>
-  <!-- No published jdk9 docs exist as of 2014-02 -->
-  <!-- <property name="jdkapi9docs.url" value="http://docs.oracle.com/javase/9/docs/api/"/> -->
+  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
+  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
+  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
+  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
+  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
+  <!-- The expected canonical location does not yet exist as of 2014-07 -->
+  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
+  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
+  <!-- Default jdk doc location (latest stable release seems best) -->
+  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
 
-  <!-- Default jdk api doc location (latest stable release seems best) -->
-  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
+  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
+  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
+  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
+  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
+  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
+  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
+  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
 
   <!-- Define the "jtreg" task -->
   <!-- See the docs in "jtreg -onlineHelp" -->
@@ -190,7 +199,7 @@
     <attribute name="compile-target" default="@{target}"/>
     <attribute name="workdir"/>
     <attribute name="classes"/>
-    <attribute name="jvmflags" default=""/>
+    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
     <element name="javac-elements" optional="true"/>
     <sequential>
 
@@ -204,7 +213,6 @@
            source="@{compile-target}"
            target="@{compile-target}"
            classpath="${junit.jar}"
-           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac@{compile-target}}"
@@ -213,6 +221,7 @@
       <include name="*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
       <compilerarg line="${build.args}"/>
       <javac-elements/>
 
@@ -224,6 +233,12 @@
           fork="true">
 	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
 	<jvmarg line="@{jvmflags}"/>
+
+        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
+	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
+	  <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
+	</syspropertyset>
+
         <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
         <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
         <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
@@ -236,7 +251,44 @@
     </sequential>
   </macrodef>
 
+  <!-- Define jtreg test sets for different jdk versions -->
+  <fileset dir="${jtreg.src.dir}">
+    <patternset id="jdk9.jtreg.tests">
+      <include name="**/*.java"/>
+    </patternset>
+  </fileset>
+
+  <fileset dir="${jtreg.src.dir}">
+    <patternset id="jdk8.jtreg.tests">
+      <include name="**/*.java"/>
+      <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
+      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
+      <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
+    </patternset>
+  </fileset>
+
+  <fileset dir="${jtreg.src.dir}">
+    <patternset id="jdk7.jtreg.tests">
+      <include name="**/*.java"/>
+      <exclude name="util/Collection/CollectionDefaults.java"/>
+      <exclude name="util/List/ListDefaults.java"/>
+      <exclude name="util/Spliterator/**/*.java"/>
+      <exclude name="**/CompletableFuture/**/*.java"/>
+      <exclude name="**/ConcurrentAssociateTest.java"/>
+      <exclude name="**/ConcurrentContainsKeyTest.java"/>
+      <exclude name="**/ConcurrentHashMap/ToArray.java"/>
+      <exclude name="**/ConcurrentRemoveIf.java"/>
+      <exclude name="**/COWSubList.java"/>
+      <exclude name="**/FutureTask/NegativeTimeout.java"/>
+      <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
+      <exclude name="**/StampedLock/**/*.java"/>
+      <exclude name="**/AtomicReferenceTest.java"/>
+      <exclude name="util/concurrent/atomic/Serial.java"/>
+    </patternset>
+  </fileset>
+
   <macrodef name="run-jtreg-tests">
+    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
     <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
     <attribute name="source" default="7"/>
     <attribute name="target"/>
@@ -252,7 +304,7 @@
            jdk="${jdk@{target}.home}"
            workDir="@{workdir}/JTwork"
            reportDir="@{workdir}/JTreport">
-
+      <patternset refid="jdk@{target}.jtreg.tests"/>
       <arg value="-Xbootclasspath/p:@{classes}"/>
       <arg value="-agentvm"/>
       <arg value="-v:nopass,fail"/>
@@ -303,6 +355,7 @@
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>
       <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <compilerarg line="${build.args}"/>
@@ -332,7 +385,7 @@
 
     <javadoc destdir="${docs.dir}"
              packagenames="none"
-             link="${jdkapi9docs.url}"
+             link="${java9.api.url}"
              overview="${src.dir}/intro.html"
              access="${build.javadoc.access}"
              sourcepath="${src.dir}:${jdk9src.dir}"
@@ -341,6 +394,7 @@
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
+      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
       <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <arg value="-XDignore.symbol.file=true"/>
       <arg value="-tag"/>
@@ -405,7 +459,7 @@
     <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   </target>
 
-
+  <target name="tck" depends="test-tck" description="alias for test-tck"/>
   <target name="test-tck"
 	  depends="jar"
           description="Runs tck tests for main directly">
@@ -416,6 +470,21 @@
       classes="${product.jar}"/>
   </target>
 
+  <target name="test-tck-parallelism-1"
+          description="Runs test-tck with given common pool parallelism">
+    <antcall target="test-tck">
+      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
+    </antcall>
+  </target>
+
+  <target name="test-tck-parallelism-0"
+          description="Runs test-tck with given common pool parallelism">
+    <antcall target="test-tck">
+      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
+    </antcall>
+  </target>
+
+  <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
   <target name="test-jtreg"
 	  depends="jar"
           description="Runs jtreg tests for main using the jtreg ant task">
@@ -426,10 +495,19 @@
   </target>
 
   <target name="test"
-          depends="test-tck, test-jtreg"
+          depends="test-tck, test-tck-parallelism-1, test-jtreg"
           description="Runs tck and jtreg tests for main">
   </target>
 
+  <target name="jtreg8" description="Runs jtreg tests with jdk8">
+
+    <antcall target="jtreg">
+      <param name="build.main.java.version" value="8"/>
+      <param name="build.main.javac" value="${javac8}"/>
+    </antcall>
+
+  </target>
+
   <target name="test89"
           description="Runs tck and jtreg tests for main for multiple java versions">
 
@@ -496,6 +574,32 @@
   </target>
 
 
+  <target name="compile-test-loops" depends="jar"
+          description="compile all the perf tests in src/test/loops">
+
+    <mkdir dir="${build.dir}/test/loops"/>
+
+    <javac srcdir="${basedir}/src/test/loops"
+           destdir="${build.dir}/test/loops"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac9}"
+           fork="true">
+
+      <include name="*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
+      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
+      <compilerarg line="${build.args}"/>
+
+    </javac>
+
+  </target>
+
+
   <!-- jsr166 4jdk7 -->
 
   <target name="4jdk7compile"
@@ -521,6 +625,7 @@
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -625,8 +730,7 @@
     <run-jtreg-tests
        target="7"
        workdir="${build.4jdk7.dir}"
-       classes="${4jdk7product.jar}"
-       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
+       classes="${4jdk7product.jar}"/>
   </target>
 
 
@@ -644,7 +748,7 @@
 
     <javadoc destdir="${4jdk7docs.dir}"
              packagenames="none"
-             link="${jdkapi7docs.url}"
+             link="${java7.api.url}"
              overview="${4jdk7src.dir}/intro.html"
              access="${build.javadoc.access}"
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
@@ -653,6 +757,7 @@
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
+      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
     </javadoc>
   </target>
@@ -707,6 +812,7 @@
       <include name="jsr166x/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -732,12 +838,13 @@
 
     <javadoc destdir="${jsr166xdocs.dir}"
              packagenames="jsr166x.*"
-             link="${jdkapidocs.url}"
+             link="${java.api.url}"
              access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              bootclasspath="${bootclasspath6}"
              source="5"
              executable="${javadoc7}">
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
     </javadoc>
@@ -792,6 +899,7 @@
       <include name="jsr166y/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -817,12 +925,13 @@
 
     <javadoc destdir="${jsr166ydocs.dir}"
              packagenames="jsr166y.*"
-             link="${jdkapidocs.url}"
+             link="${java.api.url}"
              access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              bootclasspath="${bootclasspath6}"
              source="6"
              executable="${javadoc7}">
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
     </javadoc>
@@ -878,6 +987,7 @@
       <include name="extra166y/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -903,12 +1013,13 @@
 
     <javadoc destdir="${extra166ydocs.dir}"
              packagenames="extra166y.*"
-             link="${jdkapidocs.url}"
+             link="${java.api.url}"
              access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              bootclasspath="${bootclasspath6}"
              source="6"
              executable="${javadoc7}">
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
     </javadoc>
@@ -964,6 +1075,7 @@
       <include name="jsr166e/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -990,6 +1102,7 @@
       <include name="jsr166e/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>
 
     </javac>
@@ -1015,11 +1128,12 @@
 
     <javadoc destdir="${jsr166edocs.dir}"
              packagenames="jsr166e.*"
-             link="${jdkapidocs.url}"
+             link="${java.api.url}"
              access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              source="${build.jsr166e.java.version}"
              executable="${javadoc7}">
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
     </javadoc>
@@ -1092,6 +1206,13 @@
 
   <target name="lint">
     <antcall target="dists">
+      <param name="build.javadoc.access" value="public"/>
+    </antcall>
+  </target>
+
+<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
+  <target name="lint-private">
+    <antcall target="dist">
       <param name="build.javadoc.access" value="private"/>
     </antcall>
   </target>