| 216 |
|
</sequential> |
| 217 |
|
</macrodef> |
| 218 |
|
|
| 219 |
+ |
<macrodef name="run-jtreg-tests"> |
| 220 |
+ |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
| 221 |
+ |
<attribute name="source" default="7"/> |
| 222 |
+ |
<attribute name="target"/> |
| 223 |
+ |
<attribute name="workdir"/> |
| 224 |
+ |
<attribute name="classes"/> |
| 225 |
+ |
<attribute name="jtregflags" default=""/> |
| 226 |
+ |
<sequential> |
| 227 |
+ |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
| 228 |
+ |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
| 229 |
+ |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
| 230 |
+ |
<mkdir dir="@{workdir}/JTreport"/> |
| 231 |
+ |
<jtreg dir="@{jtreg.src.dir}" |
| 232 |
+ |
jdk="${jdk@{target}.home}" |
| 233 |
+ |
workDir="@{workdir}/JTwork" |
| 234 |
+ |
reportDir="@{workdir}/JTreport"> |
| 235 |
+ |
|
| 236 |
+ |
<arg value="-Xbootclasspath/p:@{classes}"/> |
| 237 |
+ |
<arg value="-agentvm"/> |
| 238 |
+ |
<arg value="-v:nopass,fail"/> |
| 239 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
| 240 |
+ |
<arg value="-automatic"/> |
| 241 |
+ |
<arg value="-k:!ignore"/> |
| 242 |
+ |
<arg line="@{jtregflags}"/> |
| 243 |
+ |
</jtreg> |
| 244 |
+ |
</sequential> |
| 245 |
+ |
</macrodef> |
| 246 |
+ |
|
| 247 |
|
<!-- ALoops classpath --> |
| 248 |
|
<path id="loops.classpath"> |
| 249 |
|
<pathelement location="${build.loops.dir}"/> |
| 454 |
|
classes="${product.jar}"/> |
| 455 |
|
</target> |
| 456 |
|
|
| 457 |
+ |
<target name="test-jtreg" |
| 458 |
+ |
depends="jar" |
| 459 |
+ |
description="Runs jtreg tests for main using the jtreg ant task"> |
| 460 |
+ |
<run-jtreg-tests |
| 461 |
+ |
target="8" |
| 462 |
+ |
workdir="${build.dir}" |
| 463 |
+ |
classes="${product.jar}"/> |
| 464 |
+ |
</target> |
| 465 |
+ |
|
| 466 |
+ |
<target name="test-ng" |
| 467 |
+ |
depends="test-tck, test-jtreg" |
| 468 |
+ |
description="Runs tck and jtreg tests for main"> |
| 469 |
+ |
</target> |
| 470 |
+ |
|
| 471 |
|
<target name="run-tests" |
| 472 |
|
depends="compile-tests"> |
| 473 |
|
|
| 698 |
|
</target> |
| 699 |
|
|
| 700 |
|
<target name="4jdk7-test-jtreg" |
| 701 |
< |
depends="4jdk7compile" |
| 701 |
> |
depends="4jdk7jar" |
| 702 |
|
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
| 703 |
< |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
| 704 |
< |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
| 705 |
< |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
| 706 |
< |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
| 665 |
< |
<jtreg dir="${jtreg.src.dir}" |
| 666 |
< |
jdk="${jdk7.home}" |
| 667 |
< |
workDir="${build.4jdk7.dir}/JTwork" |
| 668 |
< |
reportDir="${build.4jdk7.dir}/JTreport"> |
| 669 |
< |
|
| 670 |
< |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
| 671 |
< |
<arg value="-agentvm"/> |
| 672 |
< |
<arg value="-v:nopass,fail"/> |
| 673 |
< |
<arg value="-vmoptions:-esa -ea"/> |
| 674 |
< |
<arg value="-automatic"/> |
| 675 |
< |
<arg value="-k:!ignore"/> |
| 676 |
< |
</jtreg> |
| 703 |
> |
<run-jtreg-tests |
| 704 |
> |
target="7" |
| 705 |
> |
workdir="${build.4jdk7.dir}" |
| 706 |
> |
classes="${4jdk7product.jar}"/> |
| 707 |
|
</target> |
| 708 |
|
|
| 709 |
|
|
