84 |
|
<defjdklocations v="8"/> |
85 |
|
|
86 |
|
<macrodef name="run-tck-tests"> |
87 |
< |
<attribute name="jvm"/> |
88 |
< |
<attribute name="tck.classes"/> |
87 |
> |
<attribute name="target"/> |
88 |
> |
<attribute name="workdir"/> |
89 |
|
<attribute name="product.jar" default="${product.jar}"/> |
90 |
|
<attribute name="jvmflags" default=""/> |
91 |
|
<sequential> |
92 |
+ |
|
93 |
+ |
<mkdir dir="@{workdir}/tck-classes"/> |
94 |
+ |
|
95 |
+ |
<javac srcdir="${tck.src.dir}" |
96 |
+ |
destdir="@{workdir}/tck-classes" |
97 |
+ |
debug="${build.debug}" |
98 |
+ |
debuglevel="${build.debuglevel}" |
99 |
+ |
deprecation="${build.deprecation}" |
100 |
+ |
source="6" |
101 |
+ |
classpath="${junit.jar}" |
102 |
+ |
bootclasspath="@{product.jar}:${bootclasspath6}" |
103 |
+ |
includeAntRuntime="false" |
104 |
+ |
includeJavaRuntime="false" |
105 |
+ |
executable="${javac@{target}}" |
106 |
+ |
fork="true"> |
107 |
+ |
|
108 |
+ |
<include name="**/*.java"/> |
109 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
110 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
111 |
+ |
<compilerarg line="${build.args}"/> |
112 |
+ |
</javac> |
113 |
+ |
|
114 |
|
<java classname="JSR166TestCase" |
115 |
< |
jvm="@{jvm}" fork="true"> |
115 |
> |
failonerror="true" |
116 |
> |
jvm="${java@{target}}" |
117 |
> |
fork="true"> |
118 |
|
<jvmarg value="-Xbootclasspath/p:@{product.jar}"/> |
119 |
|
<jvmarg line="@{jvmflags}"/> |
120 |
|
<classpath> |
121 |
|
<pathelement location="${junit.jar}"/> |
122 |
< |
<pathelement location="@{tck.classes}"/> |
122 |
> |
<pathelement location="@{workdir}/tck-classes"/> |
123 |
|
</classpath> |
124 |
|
</java> |
125 |
+ |
|
126 |
|
</sequential> |
127 |
|
</macrodef> |
128 |
|
|
573 |
|
|
574 |
|
</javac> |
575 |
|
|
576 |
< |
<jar destfile="${4jdk7product.jar}" index="true"> |
552 |
< |
<fileset dir="${build.4jdk7.classes.dir}"/> |
553 |
< |
</jar> |
554 |
< |
|
555 |
< |
<mkdir dir="${build.4jdk7.tck.classes.dir}"/> |
556 |
< |
|
557 |
< |
<javac srcdir="${tck.src.dir}" |
558 |
< |
destdir="${build.4jdk7.tck.classes.dir}" |
559 |
< |
debug="${build.debug}" |
560 |
< |
debuglevel="${build.debuglevel}" |
561 |
< |
deprecation="${build.deprecation}" |
562 |
< |
source="6" |
563 |
< |
classpath="${junit.jar}" |
564 |
< |
bootclasspath="${4jdk7product.jar}:${bootclasspath6}" |
565 |
< |
includeAntRuntime="false" |
566 |
< |
includeJavaRuntime="false" |
567 |
< |
executable="${javac7}" |
568 |
< |
fork="true"> |
576 |
> |
</target> |
577 |
|
|
578 |
< |
<include name="**/*.java"/> |
579 |
< |
<compilerarg line="${build.args}"/> |
580 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
573 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
578 |
> |
<target name="4jdk7-jar" |
579 |
> |
depends="4jdk7compile" |
580 |
> |
description="Builds library jar from compiled sources"> |
581 |
|
|
582 |
< |
</javac> |
582 |
> |
<jar destfile="${4jdk7product.jar}"> |
583 |
> |
<fileset dir="${build.4jdk7.classes.dir}"/> |
584 |
> |
</jar> |
585 |
|
|
586 |
|
</target> |
587 |
|
|
588 |
|
|
589 |
|
<target name="4jdk7-test-tck" |
590 |
< |
depends="4jdk7compile" |
590 |
> |
depends="4jdk7-jar" |
591 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
592 |
+ |
|
593 |
|
<run-tck-tests |
594 |
< |
jvm="${java7}" |
595 |
< |
tck.classes="${build.4jdk7.tck.classes.dir}" |
594 |
> |
target="7" |
595 |
> |
workdir="${build.4jdk7.dir}" |
596 |
|
product.jar="${4jdk7product.jar}"/> |
597 |
|
</target> |
598 |
|
|