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

Diff of /jsr166/build.xml

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

revision 1.131 by jsr166, Fri Feb 1 18:31:17 2013 UTC revision 1.138 by jsr166, Fri Mar 22 18:04:56 2013 UTC
# Line 170  As of 2013-02, the very latest lambda 8 Line 170  As of 2013-02, the very latest lambda 8
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=""/>
178        <element name="javac-elements" optional="true"/>
179      <sequential>      <sequential>
180    
181      <mkdir dir="@{workdir}/tck-classes"/>      <mkdir dir="@{workdir}/tck-classes"/>
# Line 184  As of 2013-02, the very latest lambda 8 Line 185  As of 2013-02, the very latest lambda 8
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"/>
198        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
199        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
200        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
201          <javac-elements/>
202    
203      </javac>      </javac>
204    
# Line 214  As of 2013-02, the very latest lambda 8 Line 217  As of 2013-02, the very latest lambda 8
217      </sequential>      </sequential>
218    </macrodef>    </macrodef>
219    
220      <macrodef name="run-jtreg-tests">
221        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
222        <attribute name="source" default="7"/>
223        <attribute name="target"/>
224        <attribute name="workdir"/>
225        <attribute name="classes"/>
226        <attribute name="jtregflags" default=""/>
227        <sequential>
228        <delete dir="@{workdir}/JTwork"   quiet="true"/>
229        <delete dir="@{workdir}/JTreport" quiet="true"/>
230        <mkdir dir="@{workdir}/JTwork/scratch"/>
231        <mkdir dir="@{workdir}/JTreport"/>
232        <jtreg dir="@{jtreg.src.dir}"
233               jdk="${jdk@{target}.home}"
234               workDir="@{workdir}/JTwork"
235               reportDir="@{workdir}/JTreport">
236    
237          <arg value="-Xbootclasspath/p:@{classes}"/>
238          <arg value="-agentvm"/>
239          <arg value="-v:nopass,fail"/>
240          <arg value="-vmoptions:-esa -ea"/>
241          <arg value="-automatic"/>
242          <arg value="-k:!ignore"/>
243          <arg line="@{jtregflags}"/>
244        </jtreg>
245        </sequential>
246      </macrodef>
247    
248    <!-- ALoops classpath -->    <!-- ALoops classpath -->
249    <path id="loops.classpath">    <path id="loops.classpath">
250      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 247  As of 2013-02, the very latest lambda 8 Line 278  As of 2013-02, the very latest lambda 8
278             fork="true">             fork="true">
279    
280        <include name="**/*.java"/>        <include name="**/*.java"/>
281          <compilerarg value="-Xprefer:source"/>
282        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
283        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
284        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 423  As of 2013-02, the very latest lambda 8 Line 455  As of 2013-02, the very latest lambda 8
455        classes="${product.jar}"/>        classes="${product.jar}"/>
456    </target>    </target>
457    
458      <target name="test-jtreg"
459              depends="jar"
460              description="Runs jtreg tests for main using the jtreg ant task">
461        <run-jtreg-tests
462           target="8"
463           workdir="${build.dir}"
464           classes="${product.jar}"/>
465      </target>
466    
467      <target name="test-ng"
468              depends="test-tck, test-jtreg"
469              description="Runs tck and jtreg tests for main">
470      </target>
471    
472    <target name="run-tests"    <target name="run-tests"
473            depends="compile-tests">            depends="compile-tests">
474    
# Line 588  As of 2013-02, the very latest lambda 8 Line 634  As of 2013-02, the very latest lambda 8
634             fork="true">             fork="true">
635    
636        <include name="**/*.java"/>        <include name="**/*.java"/>
637          <compilerarg value="-Xprefer:source"/>
638        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
639        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
640        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 614  As of 2013-02, the very latest lambda 8 Line 661  As of 2013-02, the very latest lambda 8
661      <run-tck-tests      <run-tck-tests
662        target="7"        target="7"
663        workdir="${build.4jdk7.dir}"        workdir="${build.4jdk7.dir}"
664        classes="${4jdk7product.jar}"/>        classes="${4jdk7product.jar}">
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>
675        </run-tck-tests>
676    </target>    </target>
677    
678    
# Line 647  As of 2013-02, the very latest lambda 8 Line 705  As of 2013-02, the very latest lambda 8
705    </target>    </target>
706    
707    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
708            depends="4jdk7compile"            depends="4jdk7jar"
709            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
710      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
711      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
712      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
713      <mkdir dir="${build.4jdk7.dir}/JTreport"/>         classes="${4jdk7product.jar}"/>
     <jtreg dir="${jtreg.src.dir}"  
            jdk="${jdk7.home}"  
            workDir="${build.4jdk7.dir}/JTwork"  
            reportDir="${build.4jdk7.dir}/JTreport">  
   
       <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>  
       <arg value="-agentvm"/>  
       <arg value="-v:nopass,fail"/>  
       <arg value="-vmoptions:-esa -ea"/>  
       <arg value="-automatic"/>  
       <arg value="-k:!ignore"/>  
     </jtreg>  
714    </target>    </target>
715    
716    
# Line 1062  As of 2013-02, the very latest lambda 8 Line 1108  As of 2013-02, the very latest lambda 8
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.131  
changed lines
  Added in v.1.138

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