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

Diff of /jsr166/build.xml

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

revision 1.137, Wed Feb 6 19:55:06 2013 UTC revision 1.138, Fri Mar 22 18:04:56 2013 UTC
# Line 170  Line 170 
170    
171    <macrodef name="run-tck-tests">    <macrodef name="run-tck-tests">
172      <attribute name="tck.src.dir" default="${tck.src.dir}"/>      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
     <attribute name="source" default="6"/>  
173      <attribute name="target"/>      <attribute name="target"/>
174        <attribute name="compile-target" default="@{target}"/>
175      <attribute name="workdir"/>      <attribute name="workdir"/>
176      <attribute name="classes"/>      <attribute name="classes"/>
177      <attribute name="jvmflags" default=""/>      <attribute name="jvmflags" default=""/>
# Line 185  Line 185 
185             debug="${build.debug}"             debug="${build.debug}"
186             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
187             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
188             source="@{source}"             source="@{compile-target}"
189               target="@{compile-target}"
190             classpath="${junit.jar}"             classpath="${junit.jar}"
191             bootclasspath="@{classes}:${bootclasspath@{source}}"             bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
192             includeAntRuntime="false"             includeAntRuntime="false"
193             includeJavaRuntime="false"             includeJavaRuntime="false"
194             executable="${javac@{target}}"             executable="${javac@{compile-target}}"
195             fork="true">             fork="true">
196    
197        <include name="*.java"/>        <include name="*.java"/>
# Line 664  Line 665 
665        <javac-elements>        <javac-elements>
666          <!-- JDK8+ test classes -->          <!-- JDK8+ test classes -->
667          <exclude name="*8Test.java"/>          <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"/>          <exclude name="CompletableFutureTest.java"/>
673          <exclude name="StampedLockTest.java"/>          <exclude name="StampedLockTest.java"/>
674        </javac-elements>        </javac-elements>
# Line 1103  Line 1108 
1108    
1109      <run-tck-tests      <run-tck-tests
1110        tck.src.dir="${test.src.dir}/tck-jsr166e"        tck.src.dir="${test.src.dir}/tck-jsr166e"
1111        source="7"        target="7"
       target="8"  
1112        workdir="${build.jsr166e.dir}"        workdir="${build.jsr166e.dir}"
1113        classes="${jsr166e.jar}"/>        classes="${jsr166e.jar}"/>
1114    </target>    </target>

Legend:
Removed from v.1.137  
changed lines
  Added in v.1.138

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8