175 |
|
<attribute name="workdir"/> |
176 |
|
<attribute name="classes"/> |
177 |
|
<attribute name="jvmflags" default=""/> |
178 |
+ |
<element name="javac-elements" optional="true"/> |
179 |
|
<sequential> |
180 |
|
|
181 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
197 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
198 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
199 |
|
<compilerarg line="${build.args}"/> |
200 |
+ |
<javac-elements/> |
201 |
|
|
202 |
|
</javac> |
203 |
|
|
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}"/> |
277 |
|
fork="true"> |
278 |
|
|
279 |
|
<include name="**/*.java"/> |
280 |
+ |
<compilerarg value="-Xprefer:source"/> |
281 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
282 |
|
<compilerarg value="-Xlint:all"/> |
283 |
|
<compilerarg line="${build.args}"/> |
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 |
|
|
633 |
|
fork="true"> |
634 |
|
|
635 |
|
<include name="**/*.java"/> |
636 |
+ |
<compilerarg value="-Xprefer:source"/> |
637 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
638 |
|
<compilerarg value="-Xlint:all"/> |
639 |
|
<compilerarg line="${build.args}"/> |
660 |
|
<run-tck-tests |
661 |
|
target="7" |
662 |
|
workdir="${build.4jdk7.dir}" |
663 |
< |
classes="${4jdk7product.jar}"/> |
663 |
> |
classes="${4jdk7product.jar}"> |
664 |
> |
<javac-elements> |
665 |
> |
<!-- JDK8+ test classes --> |
666 |
> |
<exclude name="*8Test.java"/> |
667 |
> |
<exclude name="CompletableFutureTest.java"/> |
668 |
> |
<exclude name="StampedLockTest.java"/> |
669 |
> |
</javac-elements> |
670 |
> |
</run-tck-tests> |
671 |
|
</target> |
672 |
|
|
673 |
|
|
700 |
|
</target> |
701 |
|
|
702 |
|
<target name="4jdk7-test-jtreg" |
703 |
< |
depends="4jdk7compile" |
703 |
> |
depends="4jdk7jar" |
704 |
|
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
705 |
< |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
706 |
< |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
707 |
< |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
708 |
< |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
656 |
< |
<jtreg dir="${jtreg.src.dir}" |
657 |
< |
jdk="${jdk7.home}" |
658 |
< |
workDir="${build.4jdk7.dir}/JTwork" |
659 |
< |
reportDir="${build.4jdk7.dir}/JTreport"> |
660 |
< |
|
661 |
< |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
662 |
< |
<arg value="-agentvm"/> |
663 |
< |
<arg value="-v:nopass,fail"/> |
664 |
< |
<arg value="-vmoptions:-esa -ea"/> |
665 |
< |
<arg value="-automatic"/> |
666 |
< |
<arg value="-k:!ignore"/> |
667 |
< |
</jtreg> |
705 |
> |
<run-jtreg-tests |
706 |
> |
target="7" |
707 |
> |
workdir="${build.4jdk7.dir}" |
708 |
> |
classes="${4jdk7product.jar}"/> |
709 |
|
</target> |
710 |
|
|
711 |
|
|