--- jsr166/build.xml	2015/09/26 17:58:52	1.183
+++ jsr166/build.xml	2015/10/04 05:22:26	1.187
@@ -194,12 +194,6 @@
   <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
            classpath="${lib.dir}/jtreg.jar" />
 
-  <!-- Test classpath -->
-  <path id="test.classpath">
-    <pathelement location="${build.testcases.dir}"/>
-    <pathelement location="${junit.jar}"/>
-  </path>
-
   <!-- Tck options; see JSR166TestCase.java
    To profile a single tck test class:
    ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
@@ -242,7 +236,7 @@
 
       <include name="*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <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 line="${build.args}"/>
@@ -261,7 +255,7 @@
         <!-- 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 prefix="jsr166."/>
 	</syspropertyset>
 
 	<classpath>
@@ -322,7 +316,7 @@
       <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
       <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
       <arg value="-agentvm"/>
-      <arg value="-v:nopass,fail"/>
+      <arg value="-verbose:nopass,fail,error"/>
       <arg value="-vmoptions:-esa -ea"/>
       <arg value="-automatic"/>
       <arg value="-k:!ignore"/>