--- jsr166/build.xml	2014/10/03 23:18:13	1.159
+++ jsr166/build.xml	2015/09/08 16:54:43	1.176
@@ -52,9 +52,9 @@
 
   <!-- Tck options; see JSR166TestCase.java
    To profile a single tck test class:
-   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
+   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 test-tck
+   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
   -->
   <property name="jsr166.profileTests"     value="false"/>
   <property name="jsr166.profileThreshold" value="100"/>
@@ -129,7 +129,10 @@
   <property name="test.src.dir"         location="${basedir}/src/test"/>
   <property name="loops.src.dir"        location="${basedir}/src/loops"/>
   <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
-  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
+  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
+  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
+  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
+  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
   <property name="topsrc.dir"           location="${basedir}/src"/>
@@ -213,7 +216,6 @@
            source="@{compile-target}"
            target="@{compile-target}"
            classpath="${junit.jar}"
-           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac@{compile-target}}"
@@ -222,6 +224,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/>
 
@@ -233,6 +236,12 @@
           fork="true">
 	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
 	<jvmarg line="@{jvmflags}"/>
+
+        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 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}"/>
@@ -245,9 +254,30 @@
     </sequential>
   </macrodef>
 
+  <!-- Define jtreg test sets for different jdk versions -->
+  <fileset dir="${jtreg9.src.dir}">
+    <patternset id="jdk9.jtreg.tests">
+      <include name="**/*.java"/>
+    </patternset>
+  </fileset>
+
+  <fileset dir="${jtreg8.src.dir}">
+    <patternset id="jdk8.jtreg.tests">
+      <include name="**/*.java"/>
+      <exclude name="**/SpliteratorCharacteristics.java"/>
+      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
+      <exclude name="**/GCDuringIteration.java"/>
+    </patternset>
+  </fileset>
+
+  <fileset dir="${jtreg7.src.dir}">
+    <patternset id="jdk7.jtreg.tests">
+      <include name="**/*.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}"/>
+    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="source" default="7"/>
     <attribute name="target"/>
     <attribute name="workdir"/>
@@ -258,11 +288,11 @@
     <delete dir="@{workdir}/JTreport" quiet="true"/>
     <mkdir dir="@{workdir}/JTwork/scratch"/>
     <mkdir dir="@{workdir}/JTreport"/>
-    <jtreg dir="@{jtreg.src.dir}"
+    <jtreg dir="${jtreg@{target}.src.dir}"
            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"/>
@@ -313,6 +343,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}"/>
@@ -416,8 +447,7 @@
     <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   </target>
 
-
-  <target name="test-tck"
+  <target name="tck"
 	  depends="jar"
           description="Runs tck tests for main directly">
 
@@ -427,7 +457,21 @@
       classes="${product.jar}"/>
   </target>
 
-  <target name="test-jtreg"
+  <target name="tck-parallelism-1"
+          description="Runs tck with given common pool parallelism">
+    <antcall target="tck">
+      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
+    </antcall>
+  </target>
+
+  <target name="tck-parallelism-0"
+          description="Runs tck with given common pool parallelism">
+    <antcall target="tck">
+      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
+    </antcall>
+  </target>
+
+  <target name="jtreg"
 	  depends="jar"
           description="Runs jtreg tests for main using the jtreg ant task">
     <run-jtreg-tests
@@ -437,10 +481,19 @@
   </target>
 
   <target name="test"
-          depends="test-tck, test-jtreg"
+          depends="tck, tck-parallelism-1, 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">
 
@@ -507,6 +560,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"
@@ -532,6 +611,7 @@
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -578,7 +658,7 @@
   </target>
 
 
-  <target name="4jdk7-test-tck"
+  <target name="4jdk7-tck"
 	  depends="4jdk7jar"
           description="Runs tck tests for jsr166-4jdk7 directly">
 
@@ -590,6 +670,7 @@
         <!-- JDK8+ test classes -->
         <exclude name="*8Test.java"/>
         <exclude name="*9Test.java"/>
+        <exclude name="*10Test.java"/>
         <exclude name="DoubleAccumulatorTest.java"/>
         <exclude name="DoubleAdderTest.java"/>
         <exclude name="LongAccumulatorTest.java"/>
@@ -597,12 +678,13 @@
         <exclude name="CompletableFutureTest.java"/>
         <exclude name="SplittableRandomTest.java"/>
         <exclude name="StampedLockTest.java"/>
+        <exclude name="SubmissionPublisherTest.java"/>
       </javac-elements>
     </run-tck-tests>
   </target>
 
 
-  <target name="4jdk7-test-tck-junit"
+  <target name="4jdk7-tck-junit"
           depends="4jdk7compile"
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
 
@@ -630,19 +712,18 @@
     </junit>
   </target>
 
-  <target name="4jdk7-test-jtreg"
+  <target name="4jdk7-jtreg"
 	  depends="4jdk7jar"
           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
     <run-jtreg-tests
        target="7"
        workdir="${build.4jdk7.dir}"
-       classes="${4jdk7product.jar}"
-       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
+       classes="${4jdk7product.jar}"/>
   </target>
 
 
   <target name="4jdk7-test"
-	  depends="4jdk7-test-tck, 4jdk7-test-jtreg"
+	  depends="4jdk7-tck, 4jdk7-jtreg"
           description="Runs tck and jtreg tests for jsr166-4jdk7">
   </target>
 
@@ -719,6 +800,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>
@@ -805,6 +887,7 @@
       <include name="jsr166y/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -892,6 +975,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>
@@ -979,6 +1063,7 @@
       <include name="jsr166e/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -1005,6 +1090,7 @@
       <include name="jsr166e/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>
 
     </javac>
@@ -1042,7 +1128,7 @@
   </target>
 
 
-  <target name="jsr166e-test-tck-one-java-version"
+  <target name="jsr166e-tck-one-java-version"
 	  depends="jsr166ejar">
 
     <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
@@ -1054,23 +1140,23 @@
       classes="${jsr166e.jar}"/>
   </target>
 
-  <target name="jsr166e-test-tck"
+  <target name="jsr166e-tck"
           description="Runs tck tests for jsr166e for multiple java versions">
 
 <!--     <antcall target="clean"/> -->
-<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
+<!--     <antcall target="jsr166e-tck-one-java-version"> -->
 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
 <!--     </antcall> -->
 
     <antcall target="clean"/>
-    <antcall target="jsr166e-test-tck-one-java-version">
+    <antcall target="jsr166e-tck-one-java-version">
       <param name="build.jsr166e.java.version" value="7"/>
       <param name="build.jsr166e.javac" value="${javac7}"/>
     </antcall>
 
     <antcall target="clean"/>
-    <antcall target="jsr166e-test-tck-one-java-version">
+    <antcall target="jsr166e-tck-one-java-version">
       <param name="build.jsr166e.java.version" value="6"/>
       <param name="build.jsr166e.javac" value="${javac6}"/>
     </antcall>
@@ -1078,7 +1164,7 @@
 
 
   <target name="jsr166e-test"
-	  depends="jsr166e-test-tck"
+	  depends="jsr166e-tck"
           description="Runs all tests for jsr166e">
   </target>
 
@@ -1108,6 +1194,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>