--- jsr166/build.xml	2015/09/02 04:46:40	1.171
+++ jsr166/build.xml	2015/09/11 18:43:46	1.177
@@ -1,4 +1,5 @@
-<project name="jsr166" default="usage">
+<project name="jsr166" default="usage"
+  xmlns:if="ant:if" xmlns:unless="ant:unless">
 
   <description>
 ------------------------------------------------------------------------------
@@ -38,6 +39,7 @@
     </java>
   </target>
 
+  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
 
   <!-- User-specific settings -->
   <property file="user.properties"/>
@@ -52,9 +54,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"/>
@@ -93,7 +95,12 @@
     <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
     <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
     <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
-    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
+    <available property="jdk@{v}.have.java.base"
+      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
+    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
+      if:set="jdk@{v}.have.java.base"/>
+    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
+      unless:set="jdk@{v}.have.java.base"/>
     <local name="boot.jar.dir"/>
     <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
     <path id="bootclasspath@{v}">
@@ -129,7 +136,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"/>
@@ -234,7 +244,7 @@
 	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
 	<jvmarg line="@{jvmflags}"/>
 
-        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
+        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
 	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
 	  <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
 	</syspropertyset>
@@ -252,44 +262,29 @@
   </macrodef>
 
   <!-- Define jtreg test sets for different jdk versions -->
-  <fileset dir="${jtreg.src.dir}">
+  <fileset dir="${jtreg9.src.dir}">
     <patternset id="jdk9.jtreg.tests">
       <include name="**/*.java"/>
     </patternset>
   </fileset>
 
-  <fileset dir="${jtreg.src.dir}">
+  <fileset dir="${jtreg8.src.dir}">
     <patternset id="jdk8.jtreg.tests">
       <include name="**/*.java"/>
-      <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
+      <exclude name="**/SpliteratorCharacteristics.java"/>
       <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
-      <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
+      <exclude name="**/GCDuringIteration.java"/>
     </patternset>
   </fileset>
 
-  <fileset dir="${jtreg.src.dir}">
+  <fileset dir="${jtreg7.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}"/>
+    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="source" default="7"/>
     <attribute name="target"/>
     <attribute name="workdir"/>
@@ -300,7 +295,7 @@
     <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">
@@ -459,8 +454,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"
+  <target name="tck"
 	  depends="jar"
           description="Runs tck tests for main directly">
 
@@ -470,22 +464,21 @@
       classes="${product.jar}"/>
   </target>
 
-  <target name="test-tck-parallelism-1"
-          description="Runs test-tck with given common pool parallelism">
-    <antcall target="test-tck">
+  <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="test-tck-parallelism-0"
-          description="Runs test-tck with given common pool parallelism">
-    <antcall target="test-tck">
+  <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="test-jtreg" description="alias for test-jtreg"/>
-  <target name="test-jtreg"
+  <target name="jtreg"
 	  depends="jar"
           description="Runs jtreg tests for main using the jtreg ant task">
     <run-jtreg-tests
@@ -495,7 +488,7 @@
   </target>
 
   <target name="test"
-          depends="test-tck, test-tck-parallelism-1, test-jtreg"
+          depends="tck, tck-parallelism-1, jtreg"
           description="Runs tck and jtreg tests for main">
   </target>
 
@@ -672,7 +665,7 @@
   </target>
 
 
-  <target name="4jdk7-test-tck"
+  <target name="4jdk7-tck"
 	  depends="4jdk7jar"
           description="Runs tck tests for jsr166-4jdk7 directly">
 
@@ -684,6 +677,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"/>
@@ -691,12 +685,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)">
 
@@ -724,7 +719,7 @@
     </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
@@ -735,7 +730,7 @@
 
 
   <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>
 
@@ -1140,7 +1135,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} ..."/>
@@ -1152,23 +1147,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>
@@ -1176,7 +1171,7 @@
 
 
   <target name="jsr166e-test"
-	  depends="jsr166e-test-tck"
+	  depends="jsr166e-tck"
           description="Runs all tests for jsr166e">
   </target>