ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.137 by jsr166, Wed Feb 6 19:55:06 2013 UTC vs.
Revision 1.139 by jsr166, Thu May 2 21:38:03 2013 UTC

# Line 44 | Line 44 | As of 2013-02, the very latest lambda 8
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"/>
# Line 170 | Line 176 | As of 2013-02, the very latest lambda 8
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=""/>
# Line 185 | Line 191 | As of 2013-02, the very latest lambda 8
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"/>
# Line 207 | Line 214 | As of 2013-02, the very latest lambda 8
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"/>
# Line 664 | Line 674 | As of 2013-02, the very latest lambda 8
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>
# Line 1103 | Line 1117 | As of 2013-02, the very latest lambda 8
1117  
1118      <run-tck-tests
1119        tck.src.dir="${test.src.dir}/tck-jsr166e"
1120 <      source="7"
1107 <      target="8"
1120 >      target="7"
1121        workdir="${build.jsr166e.dir}"
1122        classes="${jsr166e.jar}"/>
1123    </target>

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines