170 |
|
|
171 |
|
<macrodef name="run-tck-tests"> |
172 |
|
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
173 |
– |
<attribute name="source" default="6"/> |
173 |
|
<attribute name="target"/> |
174 |
+ |
<attribute name="compile-target" default="@{target}"/> |
175 |
|
<attribute name="workdir"/> |
176 |
|
<attribute name="classes"/> |
177 |
|
<attribute name="jvmflags" default=""/> |
185 |
|
debug="${build.debug}" |
186 |
|
debuglevel="${build.debuglevel}" |
187 |
|
deprecation="${build.deprecation}" |
188 |
< |
source="@{source}" |
188 |
> |
source="@{compile-target}" |
189 |
> |
target="@{compile-target}" |
190 |
|
classpath="${junit.jar}" |
191 |
< |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
191 |
> |
bootclasspath="@{classes}:${bootclasspath@{compile-target}}" |
192 |
|
includeAntRuntime="false" |
193 |
|
includeJavaRuntime="false" |
194 |
< |
executable="${javac@{target}}" |
194 |
> |
executable="${javac@{compile-target}}" |
195 |
|
fork="true"> |
196 |
|
|
197 |
|
<include name="*.java"/> |
217 |
|
</sequential> |
218 |
|
</macrodef> |
219 |
|
|
220 |
+ |
<macrodef name="run-jtreg-tests"> |
221 |
+ |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
222 |
+ |
<attribute name="source" default="7"/> |
223 |
+ |
<attribute name="target"/> |
224 |
+ |
<attribute name="workdir"/> |
225 |
+ |
<attribute name="classes"/> |
226 |
+ |
<attribute name="jtregflags" default=""/> |
227 |
+ |
<sequential> |
228 |
+ |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
229 |
+ |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
230 |
+ |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
231 |
+ |
<mkdir dir="@{workdir}/JTreport"/> |
232 |
+ |
<jtreg dir="@{jtreg.src.dir}" |
233 |
+ |
jdk="${jdk@{target}.home}" |
234 |
+ |
workDir="@{workdir}/JTwork" |
235 |
+ |
reportDir="@{workdir}/JTreport"> |
236 |
+ |
|
237 |
+ |
<arg value="-Xbootclasspath/p:@{classes}"/> |
238 |
+ |
<arg value="-agentvm"/> |
239 |
+ |
<arg value="-v:nopass,fail"/> |
240 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
241 |
+ |
<arg value="-automatic"/> |
242 |
+ |
<arg value="-k:!ignore"/> |
243 |
+ |
<arg line="@{jtregflags}"/> |
244 |
+ |
</jtreg> |
245 |
+ |
</sequential> |
246 |
+ |
</macrodef> |
247 |
+ |
|
248 |
|
<!-- ALoops classpath --> |
249 |
|
<path id="loops.classpath"> |
250 |
|
<pathelement location="${build.loops.dir}"/> |
278 |
|
fork="true"> |
279 |
|
|
280 |
|
<include name="**/*.java"/> |
281 |
+ |
<compilerarg value="-Xprefer:source"/> |
282 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
283 |
|
<compilerarg value="-Xlint:all"/> |
284 |
|
<compilerarg line="${build.args}"/> |
455 |
|
classes="${product.jar}"/> |
456 |
|
</target> |
457 |
|
|
458 |
+ |
<target name="test-jtreg" |
459 |
+ |
depends="jar" |
460 |
+ |
description="Runs jtreg tests for main using the jtreg ant task"> |
461 |
+ |
<run-jtreg-tests |
462 |
+ |
target="8" |
463 |
+ |
workdir="${build.dir}" |
464 |
+ |
classes="${product.jar}"/> |
465 |
+ |
</target> |
466 |
+ |
|
467 |
+ |
<target name="test-ng" |
468 |
+ |
depends="test-tck, test-jtreg" |
469 |
+ |
description="Runs tck and jtreg tests for main"> |
470 |
+ |
</target> |
471 |
+ |
|
472 |
|
<target name="run-tests" |
473 |
|
depends="compile-tests"> |
474 |
|
|
634 |
|
fork="true"> |
635 |
|
|
636 |
|
<include name="**/*.java"/> |
637 |
+ |
<compilerarg value="-Xprefer:source"/> |
638 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
639 |
|
<compilerarg value="-Xlint:all"/> |
640 |
|
<compilerarg line="${build.args}"/> |
663 |
|
workdir="${build.4jdk7.dir}" |
664 |
|
classes="${4jdk7product.jar}"> |
665 |
|
<javac-elements> |
666 |
+ |
<!-- JDK8+ test classes --> |
667 |
+ |
<exclude name="*8Test.java"/> |
668 |
+ |
<exclude name="DoubleAccumulatorTest.java"/> |
669 |
+ |
<exclude name="DoubleAdderTest.java"/> |
670 |
+ |
<exclude name="LongAccumulatorTest.java"/> |
671 |
+ |
<exclude name="LongAdderTest.java"/> |
672 |
+ |
<exclude name="CompletableFutureTest.java"/> |
673 |
|
<exclude name="StampedLockTest.java"/> |
674 |
|
</javac-elements> |
675 |
|
</run-tck-tests> |
705 |
|
</target> |
706 |
|
|
707 |
|
<target name="4jdk7-test-jtreg" |
708 |
< |
depends="4jdk7compile" |
708 |
> |
depends="4jdk7jar" |
709 |
|
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
710 |
< |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
711 |
< |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
712 |
< |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
713 |
< |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
662 |
< |
<jtreg dir="${jtreg.src.dir}" |
663 |
< |
jdk="${jdk7.home}" |
664 |
< |
workDir="${build.4jdk7.dir}/JTwork" |
665 |
< |
reportDir="${build.4jdk7.dir}/JTreport"> |
666 |
< |
|
667 |
< |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
668 |
< |
<arg value="-agentvm"/> |
669 |
< |
<arg value="-v:nopass,fail"/> |
670 |
< |
<arg value="-vmoptions:-esa -ea"/> |
671 |
< |
<arg value="-automatic"/> |
672 |
< |
<arg value="-k:!ignore"/> |
673 |
< |
</jtreg> |
710 |
> |
<run-jtreg-tests |
711 |
> |
target="7" |
712 |
> |
workdir="${build.4jdk7.dir}" |
713 |
> |
classes="${4jdk7product.jar}"/> |
714 |
|
</target> |
715 |
|
|
716 |
|
|
1108 |
|
|
1109 |
|
<run-tck-tests |
1110 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1111 |
< |
source="7" |
1072 |
< |
target="8" |
1111 |
> |
target="7" |
1112 |
|
workdir="${build.jsr166e.dir}" |
1113 |
|
classes="${jsr166e.jar}"/> |
1114 |
|
</target> |