| 84 |
|
<defjdklocations v="8"/> |
| 85 |
|
|
| 86 |
|
<macrodef name="run-tck-tests"> |
| 87 |
< |
<attribute name="jvm"/> |
| 88 |
< |
<attribute name="tck.classes"/> |
| 87 |
> |
<attribute name="target"/> |
| 88 |
> |
<attribute name="workdir"/> |
| 89 |
|
<attribute name="product.jar" default="${product.jar}"/> |
| 90 |
|
<attribute name="jvmflags" default=""/> |
| 91 |
|
<sequential> |
| 92 |
< |
<java classname="JSR166TestCase" |
| 93 |
< |
jvm="@{jvm}" fork="true"> |
| 92 |
> |
|
| 93 |
> |
<mkdir dir="@{workdir}/tck-classes"/> |
| 94 |
> |
|
| 95 |
> |
<javac srcdir="${tck.src.dir}" |
| 96 |
> |
destdir="@{workdir}/tck-classes" |
| 97 |
> |
debug="${build.debug}" |
| 98 |
> |
debuglevel="${build.debuglevel}" |
| 99 |
> |
deprecation="${build.deprecation}" |
| 100 |
> |
source="6" |
| 101 |
> |
classpath="${junit.jar}" |
| 102 |
> |
bootclasspath="@{product.jar}:${bootclasspath6}" |
| 103 |
> |
includeAntRuntime="false" |
| 104 |
> |
includeJavaRuntime="false" |
| 105 |
> |
executable="${javac@{target}}" |
| 106 |
> |
fork="true"> |
| 107 |
> |
|
| 108 |
> |
<include name="**/*.java"/> |
| 109 |
> |
<compilerarg value="-XDignore.symbol.file=true"/> |
| 110 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
| 111 |
> |
<compilerarg line="${build.args}"/> |
| 112 |
> |
</javac> |
| 113 |
> |
|
| 114 |
> |
<java classname="JSR166TestCase" jvm="${java@{target}}" fork="true"> |
| 115 |
|
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
| 116 |
|
<jvmarg line="@{jvmflags}"/> |
| 117 |
|
<classpath> |
| 118 |
|
<pathelement location="${junit.jar}"/> |
| 119 |
< |
<pathelement location="@{tck.classes}"/> |
| 119 |
> |
<pathelement location="@{workdir}/tck-classes"/> |
| 120 |
|
</classpath> |
| 121 |
|
</java> |
| 122 |
+ |
|
| 123 |
|
</sequential> |
| 124 |
|
</macrodef> |
| 125 |
|
|
| 570 |
|
|
| 571 |
|
</javac> |
| 572 |
|
|
| 573 |
< |
<jar destfile="${4jdk7product.jar}" index="true"> |
| 552 |
< |
<fileset dir="${build.4jdk7.classes.dir}"/> |
| 553 |
< |
</jar> |
| 554 |
< |
|
| 555 |
< |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
| 556 |
< |
|
| 557 |
< |
<javac srcdir="${tck.src.dir}" |
| 558 |
< |
destdir="${build.4jdk7.tck.classes.dir}" |
| 559 |
< |
debug="${build.debug}" |
| 560 |
< |
debuglevel="${build.debuglevel}" |
| 561 |
< |
deprecation="${build.deprecation}" |
| 562 |
< |
source="6" |
| 563 |
< |
classpath="${junit.jar}" |
| 564 |
< |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
| 565 |
< |
includeAntRuntime="false" |
| 566 |
< |
includeJavaRuntime="false" |
| 567 |
< |
executable="${javac7}" |
| 568 |
< |
fork="true"> |
| 573 |
> |
</target> |
| 574 |
|
|
| 575 |
< |
<include name="**/*.java"/> |
| 576 |
< |
<compilerarg line="${build.args}"/> |
| 577 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
| 573 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
| 575 |
> |
<target name="4jdk7-jar" |
| 576 |
> |
depends="4jdk7compile" |
| 577 |
> |
description="Builds library jar from compiled sources"> |
| 578 |
|
|
| 579 |
< |
</javac> |
| 579 |
> |
<jar destfile="${4jdk7product.jar}"> |
| 580 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
| 581 |
> |
</jar> |
| 582 |
|
|
| 583 |
|
</target> |
| 584 |
|
|
| 585 |
|
|
| 586 |
|
<target name="4jdk7-test-tck" |
| 587 |
< |
depends="4jdk7compile" |
| 587 |
> |
depends="4jdk7-jar" |
| 588 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
| 589 |
+ |
|
| 590 |
|
<run-tck-tests |
| 591 |
< |
jvm="${java7}" |
| 592 |
< |
tck.classes="${build.4jdk7.tck.classes.dir}" |
| 591 |
> |
target="7" |
| 592 |
> |
workdir="${build.4jdk7.dir}" |
| 593 |
|
product.jar="${4jdk7product.jar}"/> |
| 594 |
|
</target> |
| 595 |
|
|
