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

Reviewed-by: mcimadamore

make/build.properties

@@ -102,6 +102,8 @@ javac.includes = \
 javac.tests = \
         tools/javac
 
+#
+
 javadoc.includes = \
         com/sun/javadoc/ \
         com/sun/tools/javadoc/
@@ -109,18 +111,24 @@ javadoc.includes = \
 javadoc.tests = \
         tools/javadoc/
 
+#
+
 doclets.includes = \
         com/sun/tools/doclets/
 
 doclets.tests = \
         com/sun/javadoc/
 
+#
+
 javah.includes = \
         com/sun/tools/javah/
 
 javah.tests = \
         tools/javah/
 
+#
+
 javap.includes = \
         com/sun/tools/classfile/ \
         com/sun/tools/javap/ \
@@ -129,6 +137,8 @@ javap.includes = \
 javap.tests = \
         tools/javap/
 
+#
+
 apt.includes = \
         com/sun/mirror/ \
         com/sun/tools/apt/
@@ -136,4 +146,9 @@ apt.includes = \
 apt.tests = \
         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 =

make/build.xml

@@ -123,11 +123,9 @@
 
     <!-- Additional targets for running tools on the build -->
 
-    <!-- An alternative for the following would be to do a single jtreg run for all tests.
-         However, that would currently be slower, since we would have to run all the tests
-         with samevm="false", since not all test directories currently support samevm="true". -->
-
-    <target name="jtreg" depends="jtreg-javac,jtreg-javadoc,jtreg-doclets,jtreg-javah,jtreg-javap,jtreg-apt"/>
+    <target name="jtreg" depends="build-all-tools,-def-jtreg">
+        <jtreg-tool name="all" tests="${jtreg.tests}"/>
+    </target>
 
     <target name="findbugs" depends="-def-findbugs,build-all-tools">
         <property name="findbugs.reportLevel" value="medium"/>
@@ -207,7 +205,7 @@
     </target>
 
     <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 name="findbugs-javac" depends="build-javac,-def-findbugs">
@@ -239,7 +237,7 @@
     </target>
 
     <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 name="findbugs-javadoc" depends="build-javadoc,-def-findbugs">
@@ -271,7 +269,7 @@
     <!-- (no javadoc for doclets) -->
 
     <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 name="findbugs-doclets" depends="build-doclets,-def-findbugs">
@@ -301,7 +299,7 @@
     <!-- (no javadoc for javah) -->
 
     <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 name="findbugs-javah" depends="build-javah,-def-findbugs">
@@ -332,7 +330,7 @@
     <!-- (no javadoc for javap) -->
 
     <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 name="findbugs-javap" depends="build-javap,-def-findbugs">
@@ -365,7 +363,7 @@
 
 
     <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 name="findbugs-apt" depends="build-apt,-def-findbugs">
@@ -651,7 +649,7 @@
         </macrodef>
     </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">
             <classpath>
                 <pathelement location="${jtreg.home}/lib/jtreg.jar"/>
@@ -662,7 +660,7 @@
             <attribute name="name"/>
             <attribute name="tests"/>
             <attribute name="jdk" default="${target.java.home}"/>
-            <attribute name="samevm" default="false"/>
+            <attribute name="samevm" default="true"/>
             <attribute name="verbose" default="summary"/>
             <attribute name="options" default=""/>
             <attribute name="keywords" default="-keywords:!ignore"/>