--- jsr166/build.xml	2013/01/20 03:34:23	1.111
+++ jsr166/build.xml	2013/01/20 07:43:30	1.117
@@ -35,7 +35,7 @@
 
 
   <!-- Compilation options -->
-  <property name="build.sourcelevel"    value="1.6"/>
+  <property name="build.sourcelevel"    value="6"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
@@ -49,7 +49,7 @@
 
   <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
   <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
-  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
+  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
   <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
 
   <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
@@ -57,6 +57,11 @@
   <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
   <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
 
+  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
+  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
+  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
+  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
+
   <!-- JDK binary locations -->
   <property name="jdks.home"  location="${user.home}/jdk"/>
 
@@ -79,20 +84,45 @@
   <defjdklocations v="8"/>
 
   <macrodef name="run-tck-tests">
-    <attribute name="jvm"/>
-    <attribute name="tck.classes"/>
+    <attribute name="target"/>
+    <attribute name="workdir"/>
     <attribute name="product.jar" default="${product.jar}"/>
     <attribute name="jvmflags" default=""/>
     <sequential>
+
+    <mkdir dir="@{workdir}/tck-classes"/>
+
+    <javac srcdir="${tck.src.dir}"
+           destdir="@{workdir}/tck-classes"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="6"
+           classpath="${junit.jar}"
+           bootclasspath="@{product.jar}:${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac@{target}}"
+           fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <compilerarg line="${build.args}"/>
+    </javac>
+
     <java classname="JSR166TestCase"
-          jvm="@{jvm}" fork="true">
+          failonerror="true"
+          jvm="${java@{target}}"
+          fork="true">
 	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
 	<jvmarg line="@{jvmflags}"/>
 	<classpath>
 	  <pathelement location="${junit.jar}"/>
-	  <pathelement location="@{tck.classes}"/>
+	  <pathelement location="@{workdir}/tck-classes"/>
 	</classpath>
     </java>
+
     </sequential>
   </macrodef>
 
@@ -143,6 +173,11 @@
   <!-- Default jdk api doc location (latest stable release seems best) -->
   <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
 
+  <!-- Define the "jtreg" task -->
+  <!-- See the docs in "jtreg -onlineHelp" -->
+  <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}"/>
@@ -324,8 +359,6 @@
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
 
-      <classpath refid="test.classpath"/>
-
     </javac>
 
     <javac srcdir="${test.src.dir}"
@@ -334,7 +367,7 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="6"
-           classpath="${junit.jar}"
+           classpath=""
            bootclasspath="${product.jar}:${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
@@ -347,8 +380,6 @@
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
 
-      <classpath refid="test.classpath"/>
-
     </javac>
 
 <!--
@@ -364,8 +395,6 @@
       <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
 
-      <classpath refid="test.classpath"/>
-
     </javac>
 -->
 
@@ -544,41 +573,26 @@
 
     </javac>
 
-    <jar destfile="${4jdk7product.jar}" index="true">
-      <fileset dir="${build.4jdk7.classes.dir}"/>
-    </jar>
-
-    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
-
-    <javac srcdir="${tck.src.dir}"
-           destdir="${build.4jdk7.tck.classes.dir}"
-           debug="${build.debug}"
-           debuglevel="${build.debuglevel}"
-           deprecation="${build.deprecation}"
-           source="6"
-           classpath="${junit.jar}"
-           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
-           includeAntRuntime="false"
-           includeJavaRuntime="false"
-           executable="${javac7}"
-           fork="true">
+  </target>
 
-      <include name="**/*.java"/>
-      <compilerarg line="${build.args}"/>
-      <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+  <target name="4jdk7-jar"
+          depends="4jdk7compile"
+          description="Builds library jar from compiled sources">
 
-    </javac>
+    <jar destfile="${4jdk7product.jar}">
+      <fileset dir="${build.4jdk7.classes.dir}"/>
+    </jar>
 
   </target>
 
 
   <target name="4jdk7-test-tck"
-	  depends="4jdk7compile"
+	  depends="4jdk7-jar"
           description="Runs tck tests for jsr166-4jdk7 directly">
+
     <run-tck-tests
-      jvm="${java7}"
-      tck.classes="${build.4jdk7.tck.classes.dir}"
+      target="7"
+      workdir="${build.4jdk7.dir}"
       product.jar="${4jdk7product.jar}"/>
   </target>
 
@@ -611,6 +625,33 @@
     </junit>
   </target>
 
+  <target name="4jdk7-test-jtreg"
+	  depends="4jdk7compile"
+          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
+    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
+    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
+    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
+    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
+    <jtreg dir="${jtreg.src.dir}"
+           jdk="${jdk7.home}"
+           workDir="${build.4jdk7.dir}/JTwork"
+           reportDir="${build.4jdk7.dir}/JTreport">
+
+      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
+      <arg value="-agentvm"/>
+      <arg value="-v:nopass,fail"/>
+      <arg value="-vmoptions:-esa -ea"/>
+      <arg value="-automatic"/>
+      <arg value="-k:!ignore"/>
+    </jtreg>
+  </target>
+
+
+  <target name="4jdk7-test"
+	  depends="4jdk7-test-tck, 4jdk7-test-jtreg"
+          description="Runs tck and jtreg tests for jsr166-4jdk7">
+  </target>
+
 
   <target name="4jdk7docs"
           description="Builds javadocs for src/jdk7 to dist dir">
@@ -668,10 +709,10 @@
           depends="configure-compiler"
           description="Compiles jsr166x sources to build dir">
 
-    <mkdir dir="${build.jsr166x.dir}"/>
+    <mkdir dir="${build.jsr166x.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
-           destdir="${build.jsr166x.dir}"
+           destdir="${build.jsr166x.classes.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
@@ -699,7 +740,7 @@
           description="Builds library jar from compiled sources">
 
     <jar destfile="${jsr166x.jar}">
-      <fileset dir="${build.jsr166x.dir}"/>
+      <fileset dir="${build.jsr166x.classes.dir}"/>
     </jar>
 
   </target>
@@ -719,7 +760,7 @@
              bootclasspath="${bootclasspath6}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              executable="${javadoc7}"
-             additionalparam="-XDignore.symbol.file=true" />
+             additionalparam="-XDignore.symbol.file=true"/>
 
   </target>
 
@@ -759,10 +800,10 @@
           depends="configure-compiler"
           description="Compiles jsr166y sources">
 
-    <mkdir dir="${build.jsr166y.dir}"/>
+    <mkdir dir="${build.jsr166y.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
-           destdir="${build.jsr166y.dir}"
+           destdir="${build.jsr166y.classes.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
@@ -787,7 +828,7 @@
           description="Builds library jar from compiled sources">
 
     <jar destfile="${jsr166y.jar}" index="true">
-      <fileset dir="${build.jsr166y.dir}"/>
+      <fileset dir="${build.jsr166y.classes.dir}"/>
     </jar>
 
   </target>
@@ -807,7 +848,7 @@
              bootclasspath="${bootclasspath6}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              executable="${javadoc7}"
-             additionalparam="-XDignore.symbol.file=true" />
+             additionalparam="-XDignore.symbol.file=true"/>
 
   </target>
 
@@ -847,10 +888,10 @@
           depends="configure-compiler, jsr166yjar"
           description="Compiles extra166y sources">
 
-    <mkdir dir="${build.extra166y.dir}"/>
+    <mkdir dir="${build.extra166y.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
-           destdir="${build.extra166y.dir}"
+           destdir="${build.extra166y.classes.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
@@ -878,7 +919,7 @@
           description="Builds library jar from compiled sources">
 
     <jar destfile="${extra166y.jar}" index="true">
-      <fileset dir="${build.extra166y.dir}"/>
+      <fileset dir="${build.extra166y.classes.dir}"/>
     </jar>
 
   </target>
@@ -898,7 +939,7 @@
              bootclasspath="${bootclasspath6}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              executable="${javadoc7}"
-             additionalparam="-XDignore.symbol.file=true" />
+             additionalparam="-XDignore.symbol.file=true"/>
 
   </target>
 
@@ -936,10 +977,10 @@
           depends="configure-compiler"
           description="Compiles jsr166e sources">
 
-    <mkdir dir="${build.jsr166e.dir}"/>
+    <mkdir dir="${build.jsr166e.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
-           destdir="${build.jsr166e.dir}"
+           destdir="${build.jsr166e.classes.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
@@ -966,7 +1007,7 @@
           description="Builds library jar from compiled sources">
 
     <jar destfile="${jsr166e.jar}" index="true">
-      <fileset dir="${build.jsr166e.dir}"/>
+      <fileset dir="${build.jsr166e.classes.dir}"/>
     </jar>
 
   </target>