ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.114 by jsr166, Sun Jan 20 04:44:26 2013 UTC vs.
Revision 1.115 by jsr166, Sun Jan 20 06:11:07 2013 UTC

# Line 148 | Line 148
148    <!-- Default jdk api doc location (latest stable release seems best) -->
149    <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
150  
151 +  <!-- Define the "jtreg" task -->
152 +  <!-- See the docs in "jtreg -onlineHelp" -->
153 +  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
154 +           classpath="${lib.dir}/jtreg.jar" />
155 +
156    <!-- Test classpath -->
157    <path id="test.classpath">
158      <pathelement location="${build.testcases.dir}"/>
# Line 610 | Line 615
615      </junit>
616    </target>
617  
618 +  <target name="4jdk7-test-jtreg"
619 +          depends="4jdk7compile"
620 +          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
621 +    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
622 +    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
623 +    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
624 +    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
625 +    <jtreg dir="${jtreg.src.dir}"
626 +           jdk="${jdk7.home}"
627 +           workDir="${build.4jdk7.dir}/JTwork"
628 +           reportDir="${build.4jdk7.dir}/JTreport">
629 +
630 +      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
631 +      <arg value="-agentvm"/>
632 +      <arg value="-v:nopass,fail"/>
633 +      <arg value="-vmoptions:-esa -ea"/>
634 +      <arg value="-automatic"/>
635 +      <arg value="-k:!ignore"/>
636 +    </jtreg>
637 +  </target>
638 +
639 +
640 +  <target name="4jdk7-test"
641 +          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
642 +          description="Runs tck and jtreg tests for jsr166-4jdk7">
643 +  </target>
644 +
645  
646    <target name="4jdk7docs"
647            description="Builds javadocs for src/jdk7 to dist dir">
# Line 718 | Line 750
750               bootclasspath="${bootclasspath6}"
751               sourcepath="${topsrc.dir}:${jdk6src.dir}"
752               executable="${javadoc7}"
753 <             additionalparam="-XDignore.symbol.file=true" />
753 >             additionalparam="-XDignore.symbol.file=true"/>
754  
755    </target>
756  
# Line 806 | Line 838
838               bootclasspath="${bootclasspath6}"
839               sourcepath="${topsrc.dir}:${jdk6src.dir}"
840               executable="${javadoc7}"
841 <             additionalparam="-XDignore.symbol.file=true" />
841 >             additionalparam="-XDignore.symbol.file=true"/>
842  
843    </target>
844  
# Line 897 | Line 929
929               bootclasspath="${bootclasspath6}"
930               sourcepath="${topsrc.dir}:${jdk6src.dir}"
931               executable="${javadoc7}"
932 <             additionalparam="-XDignore.symbol.file=true" />
932 >             additionalparam="-XDignore.symbol.file=true"/>
933  
934    </target>
935  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines