--- jsr166/build.xml	2014/10/03 23:18:13	1.159
+++ jsr166/build.xml	2015/09/02 02:14:59	1.168
@@ -213,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}}"
@@ -222,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/>
 
@@ -233,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}"/>
@@ -245,6 +251,34 @@
     </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="util/concurrent/CompletableFuture/**/*.java"/>
+      <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
+      <exclude name="util/concurrent/locks/StampedLock/**/*.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}"/>
@@ -262,7 +296,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"/>
@@ -313,6 +347,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,7 +451,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">
@@ -427,6 +462,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">
@@ -437,10 +487,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">
 
@@ -507,6 +566,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 +617,7 @@
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg line="${build.args}"/>
 
     </javac>
@@ -636,8 +722,7 @@
     <run-jtreg-tests
        target="7"
        workdir="${build.4jdk7.dir}"
-       classes="${4jdk7product.jar}"
-       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
+       classes="${4jdk7product.jar}"/>
   </target>
 
 
@@ -719,6 +804,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 +891,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 +979,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 +1067,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 +1094,7 @@
       <include name="jsr166e/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
       <compilerarg value="-Xdoclint:all/protected"/>
 
     </javac>
@@ -1108,6 +1198,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>