--- jsr166/build.xml	2016/09/17 21:02:01	1.219
+++ jsr166/build.xml	2016/12/17 22:18:25	1.227
@@ -63,7 +63,6 @@
   <property name="build.classes.dir"           location="${build.dir}/classes"/>
   <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
   <property name="build.loops.dir"             location="${build.dir}/loops"/>
-  <property name="build.reports.dir"           location="${build.dir}/reports"/>
 
   <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
   <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
@@ -253,7 +252,7 @@
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
       <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-      <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
+      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
       <compilerarg line="${build.args}"/>
       <javac-elements/>
 
@@ -264,7 +263,11 @@
           jvm="${java@{target}}"
           fork="true">
 	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-	<jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
+	<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
+	<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
+	<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
 	<jvmarg line="@{jvmflags}"/>
 	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
 	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
@@ -296,8 +299,6 @@
     <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>
 
@@ -329,15 +330,15 @@
     </condition>
 
     <delete dir="@{workdir}/JTwork"   quiet="true"/>
-    <delete dir="@{workdir}/JTreport" quiet="true"/>
     <jtreg dir="${jtreg@{target}.src.dir}"
            jdk="${jdk@{target}.home}"
-           workDir="@{workdir}/JTwork"
-           reportDir="@{workdir}/JTreport">
+           workDir="@{workdir}/JTwork">
       <patternset refid="jdk@{target}.jtreg.tests"/>
       <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
+      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
+      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
       <arg value="-agentvm"/>
+      <arg value="-noreport"/>
       <arg value="-verbose:${jtreg.verbose}"/>
       <arg value="-vmoptions:-esa -ea"/>
       <arg value="-automatic"/>
@@ -434,8 +435,11 @@
     <!-- the packagenames="none" hack below prevents scanning the -->
     <!-- sourcepath for packages -->
 
-<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
-<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
+<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
+<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
+<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
+<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
+<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
     <javadoc destdir="${docs.dir}"
              packagenames="none"
              link="${java9.api.url}"
@@ -453,17 +457,18 @@
       <arg value="-Xmodule:java.base"/>
       <arg value="-tag"/>
       <arg value="${javadoc.jls.option}"/>
+<!-- @apiNote currently unused -->
+<!--       <arg value="-tag"/> -->
+<!--       <arg value="apiNote:a:API Note:"/> -->
       <arg value="-tag"/>
-      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
+      <arg value="implSpec:a:Implementation Requirements:"/>
       <arg value="-tag"/>
-      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
-      <arg value="-tag"/>
-      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
-<!-- tags added in jdk9 -->
-      <arg value="-tag"/>
-      <arg value="revised:X"/>
-      <arg value="-tag"/>
-      <arg value="spec:X"/>
+      <arg value="implNote:a:Implementation Note:"/>
+<!-- tags added in jdk9: currently unused -->
+<!--       <arg value="-tag"/> -->
+<!--       <arg value="revised:X"/> -->
+<!--       <arg value="-tag"/> -->
+<!--       <arg value="spec:X"/> -->
     </javadoc>
   </target>
 
@@ -811,8 +816,9 @@
       <arg value="-XDignore.symbol.file=true"/>
       <arg value="-tag"/>
       <arg value="${javadoc.jls.option}"/>
-      <arg value="-tag"/>
-      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
+<!-- @apiNote currently unused -->
+<!--       <arg value="-tag"/> -->
+<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
       <arg value="-tag"/>
       <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
       <arg value="-tag"/>