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"/> |
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> |
1108 |
|
|
1109 |
|
<run-tck-tests |
1110 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1111 |
< |
source="7" |
1107 |
< |
target="8" |
1111 |
> |
target="7" |
1112 |
|
workdir="${build.jsr166e.dir}" |
1113 |
|
classes="${jsr166e.jar}"/> |
1114 |
|
</target> |