44 |
|
<property name="build.deprecation" value="false"/> |
45 |
|
<property name="build.javadoc.access" value="protected"/> |
46 |
|
|
47 |
+ |
<!-- Tck options; see JSR166TestCase.java --> |
48 |
+ |
<!-- Use via, e.g. ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck --> |
49 |
+ |
<property name="jsr166.profileTests" value="false"/> |
50 |
+ |
<property name="jsr166.profileThreshold" value="100"/> |
51 |
+ |
<property name="jsr166.runsPerTest" value="1"/> |
52 |
+ |
|
53 |
|
<!-- Build locations --> |
54 |
|
<property name="build.dir" location="build"/> |
55 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
176 |
|
|
177 |
|
<macrodef name="run-tck-tests"> |
178 |
|
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
173 |
– |
<attribute name="source" default="6"/> |
179 |
|
<attribute name="target"/> |
180 |
+ |
<attribute name="compile-target" default="@{target}"/> |
181 |
|
<attribute name="workdir"/> |
182 |
|
<attribute name="classes"/> |
183 |
|
<attribute name="jvmflags" default=""/> |
191 |
|
debug="${build.debug}" |
192 |
|
debuglevel="${build.debuglevel}" |
193 |
|
deprecation="${build.deprecation}" |
194 |
< |
source="@{source}" |
194 |
> |
source="@{compile-target}" |
195 |
> |
target="@{compile-target}" |
196 |
|
classpath="${junit.jar}" |
197 |
< |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
197 |
> |
bootclasspath="@{classes}:${bootclasspath@{compile-target}}" |
198 |
|
includeAntRuntime="false" |
199 |
|
includeJavaRuntime="false" |
200 |
< |
executable="${javac@{target}}" |
200 |
> |
executable="${javac@{compile-target}}" |
201 |
|
fork="true"> |
202 |
|
|
203 |
|
<include name="*.java"/> |
214 |
|
fork="true"> |
215 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
216 |
|
<jvmarg line="@{jvmflags}"/> |
217 |
+ |
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
218 |
+ |
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
219 |
+ |
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
220 |
|
<classpath> |
221 |
|
<pathelement location="${junit.jar}"/> |
222 |
|
<pathelement location="@{workdir}/tck-classes"/> |
226 |
|
</sequential> |
227 |
|
</macrodef> |
228 |
|
|
229 |
+ |
<macrodef name="run-jtreg-tests"> |
230 |
+ |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
231 |
+ |
<attribute name="source" default="7"/> |
232 |
+ |
<attribute name="target"/> |
233 |
+ |
<attribute name="workdir"/> |
234 |
+ |
<attribute name="classes"/> |
235 |
+ |
<attribute name="jtregflags" default=""/> |
236 |
+ |
<sequential> |
237 |
+ |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
238 |
+ |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
239 |
+ |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
240 |
+ |
<mkdir dir="@{workdir}/JTreport"/> |
241 |
+ |
<jtreg dir="@{jtreg.src.dir}" |
242 |
+ |
jdk="${jdk@{target}.home}" |
243 |
+ |
workDir="@{workdir}/JTwork" |
244 |
+ |
reportDir="@{workdir}/JTreport"> |
245 |
+ |
|
246 |
+ |
<arg value="-Xbootclasspath/p:@{classes}"/> |
247 |
+ |
<arg value="-agentvm"/> |
248 |
+ |
<arg value="-v:nopass,fail"/> |
249 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
250 |
+ |
<arg value="-automatic"/> |
251 |
+ |
<arg value="-k:!ignore"/> |
252 |
+ |
<arg line="@{jtregflags}"/> |
253 |
+ |
</jtreg> |
254 |
+ |
</sequential> |
255 |
+ |
</macrodef> |
256 |
+ |
|
257 |
|
<!-- ALoops classpath --> |
258 |
|
<path id="loops.classpath"> |
259 |
|
<pathelement location="${build.loops.dir}"/> |
464 |
|
classes="${product.jar}"/> |
465 |
|
</target> |
466 |
|
|
467 |
+ |
<target name="test-jtreg" |
468 |
+ |
depends="jar" |
469 |
+ |
description="Runs jtreg tests for main using the jtreg ant task"> |
470 |
+ |
<run-jtreg-tests |
471 |
+ |
target="8" |
472 |
+ |
workdir="${build.dir}" |
473 |
+ |
classes="${product.jar}"/> |
474 |
+ |
</target> |
475 |
+ |
|
476 |
+ |
<target name="test-ng" |
477 |
+ |
depends="test-tck, test-jtreg" |
478 |
+ |
description="Runs tck and jtreg tests for main"> |
479 |
+ |
</target> |
480 |
+ |
|
481 |
|
<target name="run-tests" |
482 |
|
depends="compile-tests"> |
483 |
|
|
672 |
|
workdir="${build.4jdk7.dir}" |
673 |
|
classes="${4jdk7product.jar}"> |
674 |
|
<javac-elements> |
675 |
+ |
<!-- JDK8+ test classes --> |
676 |
+ |
<exclude name="*8Test.java"/> |
677 |
+ |
<exclude name="DoubleAccumulatorTest.java"/> |
678 |
+ |
<exclude name="DoubleAdderTest.java"/> |
679 |
+ |
<exclude name="LongAccumulatorTest.java"/> |
680 |
+ |
<exclude name="LongAdderTest.java"/> |
681 |
+ |
<exclude name="CompletableFutureTest.java"/> |
682 |
|
<exclude name="StampedLockTest.java"/> |
683 |
|
</javac-elements> |
684 |
|
</run-tck-tests> |
714 |
|
</target> |
715 |
|
|
716 |
|
<target name="4jdk7-test-jtreg" |
717 |
< |
depends="4jdk7compile" |
717 |
> |
depends="4jdk7jar" |
718 |
|
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
719 |
< |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
720 |
< |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
721 |
< |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
722 |
< |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
664 |
< |
<jtreg dir="${jtreg.src.dir}" |
665 |
< |
jdk="${jdk7.home}" |
666 |
< |
workDir="${build.4jdk7.dir}/JTwork" |
667 |
< |
reportDir="${build.4jdk7.dir}/JTreport"> |
668 |
< |
|
669 |
< |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
670 |
< |
<arg value="-agentvm"/> |
671 |
< |
<arg value="-v:nopass,fail"/> |
672 |
< |
<arg value="-vmoptions:-esa -ea"/> |
673 |
< |
<arg value="-automatic"/> |
674 |
< |
<arg value="-k:!ignore"/> |
675 |
< |
</jtreg> |
719 |
> |
<run-jtreg-tests |
720 |
> |
target="7" |
721 |
> |
workdir="${build.4jdk7.dir}" |
722 |
> |
classes="${4jdk7product.jar}"/> |
723 |
|
</target> |
724 |
|
|
725 |
|
|
1117 |
|
|
1118 |
|
<run-tck-tests |
1119 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1120 |
< |
source="7" |
1074 |
< |
target="8" |
1120 |
> |
target="7" |
1121 |
|
workdir="${build.jsr166e.dir}" |
1122 |
|
classes="${jsr166e.jar}"/> |
1123 |
|
</target> |