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

Diff of /jsr166/build.xml

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

revision 1.134 by jsr166, Sun Feb 3 02:25:01 2013 UTC revision 1.135 by jsr166, Mon Feb 4 19:37:52 2013 UTC
# Line 216  As of 2013-02, the very latest lambda 8 Line 216  As of 2013-02, the very latest lambda 8
216      </sequential>      </sequential>
217    </macrodef>    </macrodef>
218    
219      <macrodef name="run-jtreg-tests">
220        <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
221        <attribute name="source" default="7"/>
222        <attribute name="target"/>
223        <attribute name="workdir"/>
224        <attribute name="classes"/>
225        <attribute name="jtregflags" default=""/>
226        <sequential>
227        <delete dir="@{workdir}/JTwork"   quiet="true"/>
228        <delete dir="@{workdir}/JTreport" quiet="true"/>
229        <mkdir dir="@{workdir}/JTwork/scratch"/>
230        <mkdir dir="@{workdir}/JTreport"/>
231        <jtreg dir="@{jtreg.src.dir}"
232               jdk="${jdk@{target}.home}"
233               workDir="@{workdir}/JTwork"
234               reportDir="@{workdir}/JTreport">
235    
236          <arg value="-Xbootclasspath/p:@{classes}"/>
237          <arg value="-agentvm"/>
238          <arg value="-v:nopass,fail"/>
239          <arg value="-vmoptions:-esa -ea"/>
240          <arg value="-automatic"/>
241          <arg value="-k:!ignore"/>
242          <arg line="@{jtregflags}"/>
243        </jtreg>
244        </sequential>
245      </macrodef>
246    
247    <!-- ALoops classpath -->    <!-- ALoops classpath -->
248    <path id="loops.classpath">    <path id="loops.classpath">
249      <pathelement location="${build.loops.dir}"/>      <pathelement location="${build.loops.dir}"/>
# Line 426  As of 2013-02, the very latest lambda 8 Line 454  As of 2013-02, the very latest lambda 8
454        classes="${product.jar}"/>        classes="${product.jar}"/>
455    </target>    </target>
456    
457      <target name="test-jtreg"
458              depends="jar"
459              description="Runs jtreg tests for main using the jtreg ant task">
460        <run-jtreg-tests
461           target="8"
462           workdir="${build.dir}"
463           classes="${product.jar}"/>
464      </target>
465    
466      <target name="test-ng"
467              depends="test-tck, test-jtreg"
468              description="Runs tck and jtreg tests for main">
469      </target>
470    
471    <target name="run-tests"    <target name="run-tests"
472            depends="compile-tests">            depends="compile-tests">
473    
# Line 656  As of 2013-02, the very latest lambda 8 Line 698  As of 2013-02, the very latest lambda 8
698    </target>    </target>
699    
700    <target name="4jdk7-test-jtreg"    <target name="4jdk7-test-jtreg"
701            depends="4jdk7compile"            depends="4jdk7jar"
702            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">            description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
703      <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>      <run-jtreg-tests
704      <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>         target="7"
705      <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>         workdir="${build.4jdk7.dir}"
706      <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>  
707    </target>    </target>
708    
709    
Legend:
Removed from v.1.134  
changed lines
  Added in v.1.135
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27