/[cvs]/jsr166/build.xml
ViewVC logotype

Diff of /jsr166/build.xml

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.136 by jsr166, Tue Feb 5 03:39:35 2013 UTC revision 1.139 by jsr166, Thu May 2 21:38:03 2013 UTC
# Line 44  As of 2013-02, the very latest lambda 8 Line 44  As of 2013-02, the very latest lambda 8
44    <property name="build.deprecation"    value="false"/>    <property name="build.deprecation"    value="false"/>
45    <property name="build.javadoc.access" value="protected"/>    <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 -->    <!-- Build locations -->
54    <property name="build.dir"                   location="build"/>    <property name="build.dir"                   location="build"/>
55    <property name="build.classes.dir"           location="${build.dir}/classes"/>    <property name="build.classes.dir"           location="${build.dir}/classes"/>
# Line 170  As of 2013-02, the very latest lambda 8 Line 176  As of 2013-02, the very latest lambda 8
176    
177    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
178      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
179      <attribute name="target"/>      <attribute name="target"/>
180        <attribute name="compile-target" default="@{target}"/>
181      <attribute name="workdir"/>      <attribute name="workdir"/>
182      <attribute name="classes"/>      <attribute name="classes"/>
183      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
# Line 185  As of 2013-02, the very latest lambda 8 Line 191  As of 2013-02, the very latest lambda 8
191             debug="${build.debug}"             debug="${build.debug}"
192             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
193             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
194             source="@{source}"             source="@{compile-target}"
195               target="@{compile-target}"
196             classpath="${junit.jar}"             classpath="${junit.jar}"
197             bootclasspath="@{classes}:${bootclasspath@{source}}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
198             includeAntRuntime="false"             includeAntRuntime="false"
199             includeJavaRuntime="false"             includeJavaRuntime="false"
200             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
201             fork="true">             fork="true">
202    
203        <include name="*.java"/>        <include name="*.java"/>
# Line 207  As of 2013-02, the very latest lambda 8 Line 214  As of 2013-02, the very latest lambda 8
214            fork="true">            fork="true">
215          <jvmarg value="-Xbootclasspath/p:@{classes}"/>          <jvmarg value="-Xbootclasspath/p:@{classes}"/>
216          <jvmarg line="@{jvmflags}"/>          <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>          <classpath>
221            <pathelement location="${junit.jar}"/>            <pathelement location="${junit.jar}"/>
222            <pathelement location="@{workdir}/tck-classes"/>            <pathelement location="@{workdir}/tck-classes"/>
# Line 663  As of 2013-02, the very latest lambda 8 Line 673  As of 2013-02, the very latest lambda 8
673        classes="${4jdk7product.jar}">        classes="${4jdk7product.jar}">
674        <javac-elements>        <javac-elements>
675          <!-- JDK8+ test classes -->          <!-- 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"/>          <exclude name="StampedLockTest.java"/>
         <exclude name="ForkJoinPool8Test.java"/>  
683        </javac-elements>        </javac-elements>
684      </run-tck-tests>      </run-tck-tests>
685    </target>    </target>
# Line 1102  As of 2013-02, the very latest lambda 8 Line 1117  As of 2013-02, the very latest lambda 8
1117    
1118      <run-tck-tests      <run-tck-tests
1119        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1120        source="7"        target="7"
       target="8"  
1121        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1122        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1123    </target>    </target>

Legend:
Removed from v.1.136  
changed lines
  Added in v.1.139

dl@cs.oswego.edu
ViewVC Help
Powered by ViewVC 1.1.27