146 |
|
</path> |
147 |
|
|
148 |
|
<macrodef name="run-tck-tests"> |
149 |
+ |
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
150 |
+ |
<attribute name="source" default="6"/> |
151 |
|
<attribute name="target"/> |
152 |
|
<attribute name="workdir"/> |
153 |
< |
<attribute name="product.jar" default="${product.jar}"/> |
153 |
> |
<attribute name="classes"/> |
154 |
|
<attribute name="jvmflags" default=""/> |
155 |
|
<sequential> |
156 |
|
|
157 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
158 |
|
|
159 |
< |
<javac srcdir="${tck.src.dir}" |
159 |
> |
<javac srcdir="@{tck.src.dir}" |
160 |
|
destdir="@{workdir}/tck-classes" |
161 |
|
debug="${build.debug}" |
162 |
|
debuglevel="${build.debuglevel}" |
163 |
|
deprecation="${build.deprecation}" |
164 |
< |
source="6" |
164 |
> |
source="@{source}" |
165 |
|
classpath="${junit.jar}" |
166 |
< |
bootclasspath="@{product.jar}:${bootclasspath6}" |
166 |
> |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
167 |
|
includeAntRuntime="false" |
168 |
|
includeJavaRuntime="false" |
169 |
|
executable="${javac@{target}}" |
170 |
|
fork="true"> |
171 |
|
|
172 |
< |
<include name="JSR166TestCase.java"/> |
172 |
> |
<include name="*.java"/> |
173 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
174 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
175 |
|
<compilerarg line="${build.args}"/> |
180 |
|
failonerror="true" |
181 |
|
jvm="${java@{target}}" |
182 |
|
fork="true"> |
183 |
< |
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
183 |
> |
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
184 |
|
<jvmarg line="@{jvmflags}"/> |
185 |
|
<classpath> |
186 |
|
<pathelement location="${junit.jar}"/> |
578 |
|
<run-tck-tests |
579 |
|
target="7" |
580 |
|
workdir="${build.4jdk7.dir}" |
581 |
< |
product.jar="${4jdk7product.jar}"/> |
581 |
> |
classes="${4jdk7product.jar}"/> |
582 |
|
</target> |
583 |
|
|
584 |
|
|
1002 |
|
</target> |
1003 |
|
|
1004 |
|
|
1005 |
+ |
<target name="jsr166e-test-tck" |
1006 |
+ |
depends="jsr166e-jar" |
1007 |
+ |
description="Runs tck tests for jsr166e"> |
1008 |
+ |
|
1009 |
+ |
<run-tck-tests |
1010 |
+ |
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1011 |
+ |
source="7" |
1012 |
+ |
target="8" |
1013 |
+ |
workdir="${build.jsr166e.dir}" |
1014 |
+ |
classes="${jsr166e.jar}"/> |
1015 |
+ |
</target> |
1016 |
+ |
|
1017 |
+ |
|
1018 |
|
<target name="jsr166edist" |
1019 |
|
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
1020 |
|
description="Puts all distributable products in single hierarchy"/> |