提交 b1f6e285 编写于 作者: J jjg

6758471: should be able to set jtreg options in langtools build

Reviewed-by: mcimadamore
上级 1c3fdf96
...@@ -102,6 +102,8 @@ javac.includes = \ ...@@ -102,6 +102,8 @@ javac.includes = \
javac.tests = \ javac.tests = \
tools/javac tools/javac
#
javadoc.includes = \ javadoc.includes = \
com/sun/javadoc/ \ com/sun/javadoc/ \
com/sun/tools/javadoc/ com/sun/tools/javadoc/
...@@ -109,18 +111,24 @@ javadoc.includes = \ ...@@ -109,18 +111,24 @@ javadoc.includes = \
javadoc.tests = \ javadoc.tests = \
tools/javadoc/ tools/javadoc/
#
doclets.includes = \ doclets.includes = \
com/sun/tools/doclets/ com/sun/tools/doclets/
doclets.tests = \ doclets.tests = \
com/sun/javadoc/ com/sun/javadoc/
#
javah.includes = \ javah.includes = \
com/sun/tools/javah/ com/sun/tools/javah/
javah.tests = \ javah.tests = \
tools/javah/ tools/javah/
#
javap.includes = \ javap.includes = \
com/sun/tools/classfile/ \ com/sun/tools/classfile/ \
com/sun/tools/javap/ \ com/sun/tools/javap/ \
...@@ -129,6 +137,8 @@ javap.includes = \ ...@@ -129,6 +137,8 @@ javap.includes = \
javap.tests = \ javap.tests = \
tools/javap/ tools/javap/
#
apt.includes = \ apt.includes = \
com/sun/mirror/ \ com/sun/mirror/ \
com/sun/tools/apt/ com/sun/tools/apt/
...@@ -136,4 +146,9 @@ apt.includes = \ ...@@ -136,4 +146,9 @@ apt.includes = \
apt.tests = \ apt.tests = \
tools/apt/ tools/apt/
#
# The following value is used by the main jtreg target.
# An empty value means all tests
# Override as desired to run a specific set of tests
jtreg.tests =
...@@ -123,11 +123,9 @@ ...@@ -123,11 +123,9 @@
<!-- Additional targets for running tools on the build --> <!-- Additional targets for running tools on the build -->
<!-- An alternative for the following would be to do a single jtreg run for all tests. <target name="jtreg" depends="build-all-tools,-def-jtreg">
However, that would currently be slower, since we would have to run all the tests <jtreg-tool name="all" tests="${jtreg.tests}"/>
with samevm="false", since not all test directories currently support samevm="true". --> </target>
<target name="jtreg" depends="jtreg-javac,jtreg-javadoc,jtreg-doclets,jtreg-javah,jtreg-javap,jtreg-apt"/>
<target name="findbugs" depends="-def-findbugs,build-all-tools"> <target name="findbugs" depends="-def-findbugs,build-all-tools">
<property name="findbugs.reportLevel" value="medium"/> <property name="findbugs.reportLevel" value="medium"/>
...@@ -207,7 +205,7 @@ ...@@ -207,7 +205,7 @@
</target> </target>
<target name="jtreg-javac" depends="build-javac,-def-jtreg"> <target name="jtreg-javac" depends="build-javac,-def-jtreg">
<jtreg-tool name="javac" samevm="true" tests="${javac.tests}"/> <jtreg-tool name="javac" tests="${javac.tests}"/>
</target> </target>
<target name="findbugs-javac" depends="build-javac,-def-findbugs"> <target name="findbugs-javac" depends="build-javac,-def-findbugs">
...@@ -239,7 +237,7 @@ ...@@ -239,7 +237,7 @@
</target> </target>
<target name="jtreg-javadoc" depends="build-javadoc,-def-jtreg"> <target name="jtreg-javadoc" depends="build-javadoc,-def-jtreg">
<jtreg-tool name="javadoc" samevm="false" tests="${javadoc.tests}"/> <jtreg-tool name="javadoc" tests="${javadoc.tests}"/>
</target> </target>
<target name="findbugs-javadoc" depends="build-javadoc,-def-findbugs"> <target name="findbugs-javadoc" depends="build-javadoc,-def-findbugs">
...@@ -271,7 +269,7 @@ ...@@ -271,7 +269,7 @@
<!-- (no javadoc for doclets) --> <!-- (no javadoc for doclets) -->
<target name="jtreg-doclets" depends="build-doclets,-def-jtreg"> <target name="jtreg-doclets" depends="build-doclets,-def-jtreg">
<jtreg-tool name="doclets" samevm="false" tests="${doclets.tests}"/> <jtreg-tool name="doclets" tests="${doclets.tests}"/>
</target> </target>
<target name="findbugs-doclets" depends="build-doclets,-def-findbugs"> <target name="findbugs-doclets" depends="build-doclets,-def-findbugs">
...@@ -301,7 +299,7 @@ ...@@ -301,7 +299,7 @@
<!-- (no javadoc for javah) --> <!-- (no javadoc for javah) -->
<target name="jtreg-javah" depends="build-javah,-def-jtreg"> <target name="jtreg-javah" depends="build-javah,-def-jtreg">
<jtreg-tool name="javah" samevm="true" tests="${javah.tests}"/> <jtreg-tool name="javah" tests="${javah.tests}"/>
</target> </target>
<target name="findbugs-javah" depends="build-javah,-def-findbugs"> <target name="findbugs-javah" depends="build-javah,-def-findbugs">
...@@ -332,7 +330,7 @@ ...@@ -332,7 +330,7 @@
<!-- (no javadoc for javap) --> <!-- (no javadoc for javap) -->
<target name="jtreg-javap" depends="build-javap,-def-jtreg"> <target name="jtreg-javap" depends="build-javap,-def-jtreg">
<jtreg-tool name="javap" samevm="true" tests="${javap.tests}"/> <jtreg-tool name="javap" tests="${javap.tests}"/>
</target> </target>
<target name="findbugs-javap" depends="build-javap,-def-findbugs"> <target name="findbugs-javap" depends="build-javap,-def-findbugs">
...@@ -365,7 +363,7 @@ ...@@ -365,7 +363,7 @@
<target name="jtreg-apt" depends="build-apt,-def-jtreg"> <target name="jtreg-apt" depends="build-apt,-def-jtreg">
<jtreg-tool name="apt" samevm="true" tests="${apt.tests}"/> <jtreg-tool name="apt" tests="${apt.tests}"/>
</target> </target>
<target name="findbugs-apt" depends="build-apt,-def-findbugs"> <target name="findbugs-apt" depends="build-apt,-def-findbugs">
...@@ -651,7 +649,7 @@ ...@@ -651,7 +649,7 @@
</macrodef> </macrodef>
</target> </target>
<target name="-def-jtreg" unless="jtreg.defined" depends="-check-jtreg.home"> <target name="-def-jtreg" unless="jtreg.defined" depends="-check-jtreg.home,-check-target.java.home">
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"> <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant">
<classpath> <classpath>
<pathelement location="${jtreg.home}/lib/jtreg.jar"/> <pathelement location="${jtreg.home}/lib/jtreg.jar"/>
...@@ -662,7 +660,7 @@ ...@@ -662,7 +660,7 @@
<attribute name="name"/> <attribute name="name"/>
<attribute name="tests"/> <attribute name="tests"/>
<attribute name="jdk" default="${target.java.home}"/> <attribute name="jdk" default="${target.java.home}"/>
<attribute name="samevm" default="false"/> <attribute name="samevm" default="true"/>
<attribute name="verbose" default="summary"/> <attribute name="verbose" default="summary"/>
<attribute name="options" default=""/> <attribute name="options" default=""/>
<attribute name="keywords" default="-keywords:!ignore"/> <attribute name="keywords" default="-keywords:!ignore"/>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册