| 44 |
|
<property name="build.deprecation" value="false"/> |
| 45 |
|
<property name="build.javadoc.access" value="protected"/> |
| 46 |
|
|
| 47 |
+ |
<!-- Tck options; see JSR166TestCase.java --> |
| 48 |
+ |
<!-- 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 |
+ |
<!-- Allow running an individual tck test class --> |
| 53 |
+ |
<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck --> |
| 54 |
+ |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
| 55 |
+ |
|
| 56 |
|
<!-- Build locations --> |
| 57 |
|
<property name="build.dir" location="build"/> |
| 58 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
| 179 |
|
|
| 180 |
|
<macrodef name="run-tck-tests"> |
| 181 |
|
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
| 173 |
– |
<attribute name="source" default="6"/> |
| 182 |
|
<attribute name="target"/> |
| 183 |
+ |
<attribute name="compile-target" default="@{target}"/> |
| 184 |
|
<attribute name="workdir"/> |
| 185 |
|
<attribute name="classes"/> |
| 186 |
|
<attribute name="jvmflags" default=""/> |
| 194 |
|
debug="${build.debug}" |
| 195 |
|
debuglevel="${build.debuglevel}" |
| 196 |
|
deprecation="${build.deprecation}" |
| 197 |
< |
source="@{source}" |
| 197 |
> |
source="@{compile-target}" |
| 198 |
> |
target="@{compile-target}" |
| 199 |
|
classpath="${junit.jar}" |
| 200 |
< |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
| 200 |
> |
bootclasspath="@{classes}:${bootclasspath@{compile-target}}" |
| 201 |
|
includeAntRuntime="false" |
| 202 |
|
includeJavaRuntime="false" |
| 203 |
< |
executable="${javac@{target}}" |
| 203 |
> |
executable="${javac@{compile-target}}" |
| 204 |
|
fork="true"> |
| 205 |
|
|
| 206 |
|
<include name="*.java"/> |
| 211 |
|
|
| 212 |
|
</javac> |
| 213 |
|
|
| 214 |
< |
<java classname="JSR166TestCase" |
| 214 |
> |
<java classname="${jsr166.tckTestClass}" |
| 215 |
|
failonerror="true" |
| 216 |
|
jvm="${java@{target}}" |
| 217 |
|
fork="true"> |
| 218 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
| 219 |
|
<jvmarg line="@{jvmflags}"/> |
| 220 |
+ |
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
| 221 |
+ |
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
| 222 |
+ |
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
| 223 |
|
<classpath> |
| 224 |
|
<pathelement location="${junit.jar}"/> |
| 225 |
|
<pathelement location="@{workdir}/tck-classes"/> |
| 677 |
|
<javac-elements> |
| 678 |
|
<!-- JDK8+ test classes --> |
| 679 |
|
<exclude name="*8Test.java"/> |
| 680 |
+ |
<exclude name="DoubleAccumulatorTest.java"/> |
| 681 |
+ |
<exclude name="DoubleAdderTest.java"/> |
| 682 |
+ |
<exclude name="LongAccumulatorTest.java"/> |
| 683 |
+ |
<exclude name="LongAdderTest.java"/> |
| 684 |
|
<exclude name="CompletableFutureTest.java"/> |
| 685 |
|
<exclude name="StampedLockTest.java"/> |
| 686 |
|
</javac-elements> |
| 710 |
|
|
| 711 |
|
<formatter type="brief"/> |
| 712 |
|
|
| 713 |
< |
<test name="JSR166TestCase" haltonfailure="no"> |
| 713 |
> |
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
| 714 |
|
</test> |
| 715 |
|
|
| 716 |
|
</junit> |
| 722 |
|
<run-jtreg-tests |
| 723 |
|
target="7" |
| 724 |
|
workdir="${build.4jdk7.dir}" |
| 725 |
< |
classes="${4jdk7product.jar}"/> |
| 725 |
> |
classes="${4jdk7product.jar}" |
| 726 |
> |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
| 727 |
|
</target> |
| 728 |
|
|
| 729 |
|
|
| 1121 |
|
|
| 1122 |
|
<run-tck-tests |
| 1123 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
| 1124 |
< |
source="7" |
| 1107 |
< |
target="8" |
| 1124 |
> |
target="7" |
| 1125 |
|
workdir="${build.jsr166e.dir}" |
| 1126 |
|
classes="${jsr166e.jar}"/> |
| 1127 |
|
</target> |
