--- jsr166/build.xml	2015/11/30 00:51:40	1.192
+++ jsr166/build.xml	2016/03/24 20:44:47	1.198
@@ -238,7 +238,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 value="-Xoverride:${build.classes.dir}" if:set="modules"/>
+      <compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
       <compilerarg line="${build.args}"/>
       <javac-elements/>
 
@@ -249,13 +249,14 @@
           jvm="${java@{target}}"
           fork="true">
 	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-	<jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
+	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
 	<jvmarg line="@{jvmflags}"/>
 
         <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
 	<syspropertyset id="system-properties-used-by-tck">
 	  <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
 	  <propertyref prefix="jsr166."/>
+	  <propertyref name="test.timeout.factor"/>
 	</syspropertyset>
 
 	<classpath>
@@ -289,6 +290,9 @@
     </patternset>
   </fileset>
 
+  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
+  <property name="jtreg.flags" value=""/>
+
   <macrodef name="run-jtreg-tests">
     <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="source" default="7"/>
@@ -310,20 +314,23 @@
     <delete dir="@{workdir}/JTwork"   quiet="true"/>
     <delete dir="@{workdir}/JTreport" quiet="true"/>
     <mkdir dir="@{workdir}/JTwork/scratch"/>
-    <mkdir dir="@{workdir}/JTreport"/>
+    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
+    <mkdir dir="@{workdir}/JTreport/html"/>
+    <mkdir dir="@{workdir}/JTreport/text"/>
     <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}" unless:set="modules"/>
-      <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
+      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
       <arg value="-agentvm"/>
       <arg value="-verbose:${jtreg.verbose}"/>
       <arg value="-vmoptions:-esa -ea"/>
       <arg value="-automatic"/>
       <arg value="-k:!ignore"/>
       <arg line="@{jtregflags}"/>
+      <arg line="${jtreg.flags}"/>
     </jtreg>
     </sequential>
   </macrodef>
@@ -386,6 +393,9 @@
       <compilerarg line="${build.args}"/>
 
     </javac>
+
+    <!-- We need jdk9's Contended annotation, but at compile time only -->
+    <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
   </target>
 
 
@@ -435,6 +445,11 @@
       <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"/>
     </javadoc>
   </target>