1.1 --- a/make/build.xml Fri Aug 14 08:53:23 2009 -0700
1.2 +++ b/make/build.xml Tue Aug 18 17:46:58 2009 -0700
1.3 @@ -31,7 +31,7 @@
1.4 -->
1.5
1.6 <project name="langtools" default="build" basedir="..">
1.7 -
1.8 +
1.9 <!-- Force full debuginfo for javac if the debug.classfiles
1.10 property is set. This must be BEFORE the include of
1.11 build.properties because it sets javac.debuglevel. -->
1.12 @@ -49,8 +49,8 @@
1.13
1.14 <!-- Use this location for customizations common to all OpenJDK workspaces -->
1.15 <property file="${user.home}/.openjdk/build.properties"/>
1.16 -
1.17 - <!-- Convenient shorthands for standard locations within the workspace. -->
1.18 +
1.19 + <!-- Convenient shorthands for standard locations within the workspace. -->
1.20 <property name="build.dir" location="build"/>
1.21 <property name="build.bootstrap.dir" location="${build.dir}/bootstrap"/>
1.22 <property name="build.coverage.dir" location="${build.dir}/coverage"/>
1.23 @@ -75,15 +75,25 @@
1.24 The best file to check for across Solaris/Linux/Windows/MacOS is one of the
1.25 executables; regrettably, that is OS-specific. -->
1.26 <condition property="java.marker" value="bin/java">
1.27 - <os family="unix"/>
1.28 + <os family="unix"/>
1.29 </condition>
1.30 <condition property="java.marker" value="bin/java.exe">
1.31 - <os family="windows"/>
1.32 + <os family="windows"/>
1.33 </condition>
1.34 -
1.35 +
1.36 <!-- Standard property values, if not overriden by earlier settings. -->
1.37 - <property file="${make.dir}/build.properties"/>
1.38 -
1.39 + <property file="${make.dir}/build.properties"/>
1.40 +
1.41 + <!-- launcher.java is used in the launcher scripts provided to run
1.42 + the tools' jar files. If it has not already been set, then
1.43 + default it to use ${target.java.home}, if available, otherwise
1.44 + quietly default to simply use "java". -->
1.45 + <condition property="launcher.java"
1.46 + value="${target.java.home}/bin/java" else="java">
1.47 + <isset property="target.java.home"/>
1.48 + </condition>
1.49 +
1.50 +
1.51 <!-- Standard target to build deliverables for JDK build. -->
1.52
1.53 <target name="build" depends="build-bootstrap-tools,build-all-classes">
1.54 @@ -97,13 +107,13 @@
1.55 <jar file="${dist.lib.dir}/classes.jar" basedir="${build.classes.dir}"/>
1.56 <zip file="${dist.lib.dir}/src.zip" basedir="${src.classes.dir}"/>
1.57 </target>
1.58 -
1.59 +
1.60 <target name="build-bootstrap-tools" depends="build-bootstrap-javac,build-bootstrap-javadoc,build-bootstrap-doclets,build-bootstrap-javah"/>
1.61 -
1.62 +
1.63 <target name="build-all-tools" depends="build-javac,build-javadoc,build-doclets,build-javah,build-javap,build-apt"/>
1.64 -
1.65 +
1.66 <target name="build-all-classes" depends="build-classes-javac,build-classes-javadoc,build-classes-doclets,build-classes-javah,build-classes-javap,build-classes-apt"/>
1.67 -
1.68 +
1.69 <!-- clean -->
1.70
1.71 <target name="clean" description="Delete all generated files">
1.72 @@ -112,13 +122,11 @@
1.73 </target>
1.74
1.75 <!-- Additional targets for running tools on the build -->
1.76 -
1.77 - <!-- An alternative for the following would be to do a single jtreg run for all tests.
1.78 - However, that would currently be slower, since we would have to run all the tests
1.79 - with samevm="false", since not all test directories currently support samevm="true". -->
1.80
1.81 - <target name="jtreg" depends="jtreg-javac,jtreg-javadoc,jtreg-doclets,jtreg-javah,jtreg-javap,jtreg-apt"/>
1.82 -
1.83 + <target name="jtreg" depends="build-all-tools,-def-jtreg">
1.84 + <jtreg-tool name="all" tests="${jtreg.tests}"/>
1.85 + </target>
1.86 +
1.87 <target name="findbugs" depends="-def-findbugs,build-all-tools">
1.88 <property name="findbugs.reportLevel" value="medium"/>
1.89 <mkdir dir="${dist.findbugs.dir}"/>
1.90 @@ -160,52 +168,52 @@
1.91 <delete file="${build.coverage.dir}/cobertura.ser"/>
1.92 <cobertura-instrument todir="${build.coverage.dir}/classes"
1.93 datafile="${build.coverage.dir}/cobertura.ser">
1.94 - <fileset dir="${build.classes.dir}"
1.95 + <fileset dir="${build.classes.dir}"
1.96 includes="**/*.class" excludes="**/resources/*.class"/>
1.97 </cobertura-instrument>
1.98 - </target>
1.99 + </target>
1.100
1.101 <target name="coverage-report" depends="-def-cobertura">
1.102 <mkdir dir="${dist.coverage.dir}"/>
1.103 - <cobertura-report
1.104 + <cobertura-report
1.105 srcdir="${src.classes.dir}"
1.106 destdir="${dist.coverage.dir}"
1.107 datafile="${build.coverage.dir}/cobertura.ser"/>
1.108 - <cobertura-report
1.109 - format="xml"
1.110 - srcdir="${src.classes.dir}"
1.111 + <cobertura-report
1.112 + format="xml"
1.113 + srcdir="${src.classes.dir}"
1.114 destdir="${dist.coverage.dir}"
1.115 datafile="${build.coverage.dir}/cobertura.ser"/>
1.116 </target>
1.117 -
1.118 +
1.119 <!-- javac targets -->
1.120
1.121 <target name="build-bootstrap-javac" depends="-def-build-bootstrap-tool">
1.122 <build-bootstrap-tool name="javac" includes="${javac.includes}"/>
1.123 </target>
1.124 -
1.125 +
1.126 <target name="build-classes-javac" depends="build-bootstrap-javac">
1.127 <build-classes name="javac" includes="${javac.includes}"/>
1.128 </target>
1.129 -
1.130 +
1.131 <target name="build-javac" depends="build-bootstrap-javac">
1.132 <build-tool name="javac" includes="${javac.includes}"/>
1.133 </target>
1.134 -
1.135 +
1.136 <target name="javadoc-javac" depends="build-javac,-def-javadoc-tool">
1.137 <javadoc-tool name="javac" includes="${javac.includes}" options="${javadoc.jls3.option}"/>
1.138 </target>
1.139 -
1.140 +
1.141 <target name="jtreg-javac" depends="build-javac,-def-jtreg">
1.142 - <jtreg-tool name="javac" samevm="true" tests="${javac.tests}"/>
1.143 + <jtreg-tool name="javac" tests="${javac.tests}"/>
1.144 </target>
1.145 -
1.146 +
1.147 <target name="findbugs-javac" depends="build-javac,-def-findbugs">
1.148 <findbugs-tool name="javac"/>
1.149 </target>
1.150 -
1.151 +
1.152 <target name="javac" depends="build-javac,jtreg-javac,findbugs-javac"/>
1.153 -
1.154 +
1.155 <!-- javadoc targets -->
1.156
1.157 <target name="build-bootstrap-javadoc" depends="build-bootstrap-javac">
1.158 @@ -213,31 +221,31 @@
1.159 includes="${javadoc.includes}"
1.160 jarclasspath="javac.jar doclets.jar"/>
1.161 </target>
1.162 -
1.163 +
1.164 <target name="build-classes-javadoc" depends="build-classes-javac">
1.165 <build-classes name="javadoc" includes="${javadoc.includes}"/>
1.166 </target>
1.167 -
1.168 +
1.169 <target name="build-javadoc" depends="build-javac">
1.170 <build-tool name="javadoc"
1.171 includes="${javadoc.includes}"
1.172 jarclasspath="javac.jar doclets.jar"/>
1.173 </target>
1.174 -
1.175 +
1.176 <target name="javadoc-javadoc" depends="build-javadoc,-def-javadoc-tool">
1.177 <javadoc-tool name="javadoc" includes="${javadoc.includes}"/>
1.178 </target>
1.179 -
1.180 +
1.181 <target name="jtreg-javadoc" depends="build-javadoc,-def-jtreg">
1.182 - <jtreg-tool name="javadoc" samevm="false" tests="${javadoc.tests}"/>
1.183 + <jtreg-tool name="javadoc" tests="${javadoc.tests}"/>
1.184 </target>
1.185 -
1.186 +
1.187 <target name="findbugs-javadoc" depends="build-javadoc,-def-findbugs">
1.188 <findbugs-tool name="javadoc"/>
1.189 </target>
1.190 -
1.191 +
1.192 <target name="javadoc" depends="build-javadoc,jtreg-javadoc,findbugs-javadoc"/>
1.193 -
1.194 +
1.195 <!-- doclets targets -->
1.196
1.197 <target name="build-bootstrap-doclets" depends="build-bootstrap-javadoc,-def-build-bootstrap-jar">
1.198 @@ -246,11 +254,11 @@
1.199 jarmainclass="com.sun.tools.javadoc.Main"
1.200 jarclasspath="javadoc.jar"/>
1.201 </target>
1.202 -
1.203 +
1.204 <target name="build-classes-doclets" depends="build-classes-javadoc">
1.205 <build-classes name="doclets" includes="${doclets.includes}"/>
1.206 </target>
1.207 -
1.208 +
1.209 <target name="build-doclets" depends="build-javadoc">
1.210 <!-- just jar, no bin for doclets -->
1.211 <build-jar name="doclets"
1.212 @@ -259,17 +267,17 @@
1.213 </target>
1.214
1.215 <!-- (no javadoc for doclets) -->
1.216 -
1.217 +
1.218 <target name="jtreg-doclets" depends="build-doclets,-def-jtreg">
1.219 - <jtreg-tool name="doclets" samevm="false" tests="${doclets.tests}"/>
1.220 + <jtreg-tool name="doclets" tests="${doclets.tests}"/>
1.221 </target>
1.222 -
1.223 +
1.224 <target name="findbugs-doclets" depends="build-doclets,-def-findbugs">
1.225 <findbugs-tool name="doclets"/>
1.226 </target>
1.227 -
1.228 +
1.229 <target name="doclets" depends="build-doclets,jtreg-doclets,findbugs-doclets"/>
1.230 -
1.231 +
1.232 <!-- javah targets -->
1.233
1.234 <target name="build-bootstrap-javah" depends="build-bootstrap-javadoc">
1.235 @@ -277,29 +285,29 @@
1.236 includes="${javah.includes}"
1.237 jarclasspath="javadoc.jar doclets.jar javac.jar"/>
1.238 </target>
1.239 -
1.240 +
1.241 <target name="build-javah" depends="build-javadoc">
1.242 <build-tool name="javah"
1.243 includes="${javah.includes}"
1.244 jarclasspath="javadoc.jar doclets.jar javac.jar"/>
1.245 </target>
1.246 -
1.247 +
1.248 <target name="build-classes-javah" depends="build-classes-javadoc">
1.249 <build-classes name="javah" includes="${javah.includes}"/>
1.250 </target>
1.251 -
1.252 +
1.253 <!-- (no javadoc for javah) -->
1.254
1.255 <target name="jtreg-javah" depends="build-javah,-def-jtreg">
1.256 - <jtreg-tool name="javah" samevm="true" tests="${javah.tests}"/>
1.257 + <jtreg-tool name="javah" tests="${javah.tests}"/>
1.258 </target>
1.259 -
1.260 +
1.261 <target name="findbugs-javah" depends="build-javah,-def-findbugs">
1.262 <findbugs-tool name="javah"/>
1.263 </target>
1.264 -
1.265 +
1.266 <target name="javah" depends="build-javah,jtreg-javah,findbugs-javah"/>
1.267 -
1.268 +
1.269 <!-- javap targets -->
1.270
1.271 <target name="build-bootstrap-javap" depends="-def-build-bootstrap-tool">
1.272 @@ -307,85 +315,85 @@
1.273 includes="${javap.includes}"
1.274 jarmainclass="sun.tools.javap.Main"/>
1.275 </target>
1.276 -
1.277 +
1.278 <target name="build-classes-javap" depends="build-classes-javac">
1.279 <build-classes name="javap" includes="${javap.includes}"/>
1.280 </target>
1.281 -
1.282 +
1.283 <target name="build-javap" depends="build-javac">
1.284 <build-tool name="javap"
1.285 includes="${javap.includes}"
1.286 jarmainclass="com.sun.tools.javap.Main"
1.287 jarclasspath="javac.jar"/>
1.288 </target>
1.289 -
1.290 +
1.291 <!-- (no javadoc for javap) -->
1.292
1.293 <target name="jtreg-javap" depends="build-javap,-def-jtreg">
1.294 - <jtreg-tool name="javap" samevm="true" tests="${javap.tests}"/>
1.295 + <jtreg-tool name="javap" tests="${javap.tests}"/>
1.296 </target>
1.297 -
1.298 +
1.299 <target name="findbugs-javap" depends="build-javap,-def-findbugs">
1.300 <findbugs-tool name="javap"/>
1.301 </target>
1.302 -
1.303 +
1.304 <target name="javap" depends="build-javap,jtreg-javap,findbugs-javap"/>
1.305 -
1.306 +
1.307 <!-- apt targets -->
1.308 -
1.309 +
1.310 <target name="build-bootstrap-apt" depends="build-bootstrap-javac">
1.311 <build-bootstrap-tool name="apt"
1.312 includes="${apt.includes}"
1.313 jarclasspath="javac.jar"/>
1.314 </target>
1.315 -
1.316 +
1.317 <target name="build-apt" depends="build-javac">
1.318 <build-tool name="apt"
1.319 includes="${apt.includes}"
1.320 jarclasspath="javac.jar"/>
1.321 </target>
1.322 -
1.323 +
1.324 <target name="build-classes-apt" depends="build-classes-javac">
1.325 <build-classes name="apt" includes="${apt.includes}"/>
1.326 </target>
1.327 -
1.328 +
1.329 <target name="javadoc-apt" depends="build-apt,-def-javadoc-tool">
1.330 <javadoc-tool name="apt" includes="${apt.includes}"/>
1.331 </target>
1.332 -
1.333 -
1.334 +
1.335 +
1.336 <target name="jtreg-apt" depends="build-apt,-def-jtreg">
1.337 - <jtreg-tool name="apt" samevm="true" tests="${apt.tests}"/>
1.338 + <jtreg-tool name="apt" tests="${apt.tests}"/>
1.339 </target>
1.340 -
1.341 +
1.342 <target name="findbugs-apt" depends="build-apt,-def-findbugs">
1.343 <findbugs-tool name="apt"/>
1.344 </target>
1.345 -
1.346 +
1.347 <target name="apt" depends="build-apt,jtreg-apt,findbugs-apt"/>
1.348
1.349 <!-- Check targets -->
1.350 -
1.351 +
1.352 <target name="-check-boot.java.home" depends="-def-check">
1.353 <check name="bootstrap java" property="boot.java.home" marker="${java.marker}"/>
1.354 </target>
1.355 -
1.356 +
1.357 <target name="-check-target.java.home" depends="-def-check">
1.358 <check name="target java" property="target.java.home" marker="${java.marker}"/>
1.359 </target>
1.360 -
1.361 +
1.362 <target name="-check-cobertura.home" depends="-def-check">
1.363 <check name="cobertura" property="cobertura.home" marker="cobertura.jar"/>
1.364 </target>
1.365 -
1.366 +
1.367 <target name="-check-findbugs.home" depends="-def-check">
1.368 <check name="findbugs" property="findbugs.home" marker="lib/findbugs.jar"/>
1.369 </target>
1.370 -
1.371 +
1.372 <target name="-check-jtreg.home" depends="-def-check">
1.373 <check name="jtreg" property="jtreg.home" marker="lib/jtreg.jar"/>
1.374 </target>
1.375 -
1.376 +
1.377 <!-- Ant macro and preset defs -->
1.378
1.379 <target name="-def-build-tool" depends="-def-build-jar">
1.380 @@ -397,7 +405,7 @@
1.381 <attribute name="classes.dir" default="${build.classes.dir}"/>
1.382 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/>
1.383 <attribute name="lib.dir" default="${dist.lib.dir}"/>
1.384 - <attribute name="java" default="java"/>
1.385 + <attribute name="java" default="${launcher.java}"/>
1.386 <attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/>
1.387 <attribute name="javac.java.home" default="${boot.java.home}"/>
1.388 <attribute name="javac.source" default="${javac.source}"/>
1.389 @@ -425,8 +433,8 @@
1.390 <mkdir dir="@{bin.dir}"/>
1.391 <copy file="${src.bin.dir}/launcher.sh-template" tofile="@{bin.dir}/@{name}">
1.392 <filterset begintoken="#" endtoken="#">
1.393 - <filter token="PROGRAM" value="@{name}"/>
1.394 - <filter token="TARGET_JAVA" value="@{java}"/>
1.395 + <filter token="PROGRAM" value="@{name}"/>
1.396 + <filter token="TARGET_JAVA" value="@{java}"/>
1.397 </filterset>
1.398 </copy>
1.399 <chmod file="@{bin.dir}/@{name}" perm="ugo+rx"/>
1.400 @@ -467,7 +475,7 @@
1.401 <jar destfile="@{lib.dir}/@{name}.jar"
1.402 basedir="@{classes.dir}"
1.403 includes="@{includes}">
1.404 - <manifest>
1.405 + <manifest>
1.406 <attribute name="Main-Class" value="@{jarmainclass}"/>
1.407 <attribute name="Class-Path" value="@{jarclasspath}"/>
1.408 </manifest>
1.409 @@ -530,7 +538,7 @@
1.410 includeAntRuntime="no"
1.411 source="@{javac.source}"
1.412 target="@{javac.target}"
1.413 - debug="${javac.debug}"
1.414 + debug="${javac.debug}"
1.415 debuglevel="${javac.debuglevel}">
1.416 <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/>
1.417 <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/>
1.418 @@ -539,7 +547,7 @@
1.419 <compilerarg line="${javac.lint.opts}"/>
1.420 </javac>
1.421 <copy todir="@{classes.dir}">
1.422 - <fileset dir="${src.classes.dir}">
1.423 + <fileset dir="${src.classes.dir}">
1.424 <include name="@{includes}"/>
1.425 <exclude name="**/*.java"/>
1.426 <exclude name="**/*.properties"/>
1.427 @@ -550,7 +558,7 @@
1.428 </sequential>
1.429 </macrodef>
1.430 </target>
1.431 -
1.432 +
1.433 <target name="-def-build-bootstrap-tool" depends="-check-boot.java.home,-def-build-tool">
1.434 <presetdef name="build-bootstrap-tool">
1.435 <build-tool
1.436 @@ -566,7 +574,7 @@
1.437 full.version="${bootstrap.full.version}"/>
1.438 </presetdef>
1.439 </target>
1.440 -
1.441 +
1.442 <target name="-def-build-bootstrap-jar" depends="-def-build-jar">
1.443 <presetdef name="build-bootstrap-jar">
1.444 <build-jar
1.445 @@ -580,7 +588,7 @@
1.446 full.version="${bootstrap.full.version}"/>
1.447 </presetdef>
1.448 </target>
1.449 -
1.450 +
1.451 <target name="-def-pcompile">
1.452 <mkdir dir="${build.toolclasses.dir}"/>
1.453 <javac fork="true"
1.454 @@ -589,10 +597,10 @@
1.455 destdir="${build.toolclasses.dir}/"
1.456 classpath="${ant.home}/lib/ant.jar"/>
1.457 <taskdef name="pcompile"
1.458 - classname="CompilePropertiesTask"
1.459 + classname="CompilePropertiesTask"
1.460 classpath="${build.toolclasses.dir}/"/>
1.461 </target>
1.462 -
1.463 +
1.464 <target name="-def-javadoc-tool" depends="-check-target.java.home">
1.465 <macrodef name="javadoc-tool">
1.466 <attribute name="name"/>
1.467 @@ -604,14 +612,14 @@
1.468 <!-- Note: even with this default value, includes
1.469 from src.classes.dir get javadoc'd; see packageset below -->
1.470 <property name="javadoc.packagenames" value="none"/> <!-- default, can be overridden per user or per project -->
1.471 - <javadoc
1.472 + <javadoc
1.473 executable="${target.java.home}/bin/javadoc"
1.474 - destdir="${build.javadoc.dir}/@{name}"
1.475 + destdir="${build.javadoc.dir}/@{name}"
1.476 source="@{source}"
1.477 - windowtitle="UNOFFICIAL"
1.478 - failonerror="true"
1.479 + windowtitle="UNOFFICIAL"
1.480 + failonerror="true"
1.481 use="true"
1.482 - author="false"
1.483 + author="false"
1.484 version="false"
1.485 packagenames="${javadoc.packagenames}" >
1.486 <header><![CDATA[<strong>Unofficial Javadoc</strong> generated from developer sources for preview purposes only]]></header>
1.487 @@ -640,8 +648,8 @@
1.488 </sequential>
1.489 </macrodef>
1.490 </target>
1.491 -
1.492 - <target name="-def-jtreg" unless="jtreg.defined" depends="-check-jtreg.home">
1.493 +
1.494 + <target name="-def-jtreg" unless="jtreg.defined" depends="-check-jtreg.home,-check-target.java.home">
1.495 <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant">
1.496 <classpath>
1.497 <pathelement location="${jtreg.home}/lib/jtreg.jar"/>
1.498 @@ -652,7 +660,7 @@
1.499 <attribute name="name"/>
1.500 <attribute name="tests"/>
1.501 <attribute name="jdk" default="${target.java.home}"/>
1.502 - <attribute name="samevm" default="false"/>
1.503 + <attribute name="samevm" default="true"/>
1.504 <attribute name="verbose" default="summary"/>
1.505 <attribute name="options" default=""/>
1.506 <attribute name="keywords" default="-keywords:!ignore"/>
1.507 @@ -660,9 +668,9 @@
1.508 <sequential>
1.509 <property name="coverage.options" value=""/> <!-- default -->
1.510 <property name="coverage.classpath" value=""/> <!-- default -->
1.511 - <jtreg
1.512 + <jtreg
1.513 dir="${test.dir}"
1.514 - workDir="${build.jtreg.dir}/@{name}/work"
1.515 + workDir="${build.jtreg.dir}/@{name}/work"
1.516 reportDir="${build.jtreg.dir}/@{name}/report"
1.517 jdk="@{jdk}"
1.518 samevm="@{samevm}" verbose="@{verbose}"
1.519 @@ -673,7 +681,7 @@
1.520 <arg line="@{options}"/>
1.521 <arg line="@{tests}"/>
1.522 </jtreg>
1.523 - <!-- the next two properties are for convenience, when only
1.524 + <!-- the next two properties are for convenience, when only
1.525 a single instance of jtreg will be invoked. -->
1.526 <condition property="jtreg.passed">
1.527 <equals arg1="${jtreg.@{name}.result}" arg2="0"/>
1.528 @@ -691,9 +699,9 @@
1.529 <include name="lib/**/*.jar"/>
1.530 </fileset>
1.531 </path>
1.532 - <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>
1.533 + <taskdef classpathref="cobertura.classpath" resource="tasks.properties"/>
1.534 </target>
1.535 -
1.536 +
1.537 <target name="-def-findbugs" unless="findbugs.defined" depends="-check-findbugs.home">
1.538 <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask">
1.539 <classpath>
1.540 @@ -706,7 +714,7 @@
1.541 <attribute name="outputFile" default=""/>
1.542 <attribute name="reportLevel" default="high"/>
1.543 <sequential>
1.544 - <findbugs
1.545 + <findbugs
1.546 home="${findbugs.home}"
1.547 output="@{output}"
1.548 outputFile="@{outputFile}"
1.549 @@ -727,7 +735,7 @@
1.550 </macrodef>
1.551 <property name="findbugs.defined" value="true"/>
1.552 </target>
1.553 -
1.554 +
1.555 <target name="-def-check">
1.556 <macrodef name="check">
1.557 <attribute name="name"/>
1.558 @@ -753,7 +761,7 @@
1.559 </target>
1.560
1.561 <!-- standard JDK target -->
1.562 - <target name="sanity"
1.563 + <target name="sanity"
1.564 description="display settings of congiguration values">
1.565 <echo level="info">ant.home = ${ant.home}</echo>
1.566 <echo level="info">boot.java.home = ${boot.java.home}</echo>
1.567 @@ -769,15 +777,15 @@
1.568
1.569 <target name="post-sanity" depends="-def-jtreg,sanity,build"
1.570 description="perform basic validation after a standard build">
1.571 - <jtreg
1.572 + <jtreg
1.573 dir="make/test"
1.574 - workDir="${build.jtreg.dir}/post-sanity/work"
1.575 + workDir="${build.jtreg.dir}/post-sanity/work"
1.576 reportDir="${build.jtreg.dir}/post-sanity/report"
1.577 jdk="${target.java.home}"
1.578 verbose="summary"
1.579 failonerror="false" resultproperty="jtreg.post-sanity.result">
1.580 </jtreg>
1.581 -
1.582 +
1.583 </target>
1.584 </project>
1.585
