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

Diff of /jsr166/build.xml

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

revision 1.166 by jsr166, Mon Aug 10 06:32:23 2015 UTC revision 1.173 by jsr166, Thu Sep 3 01:24:31 2015 UTC
# Line 129  Line 129 
129    <property name="test.src.dir"         location="${basedir}/src/test"/>    <property name="test.src.dir"         location="${basedir}/src/test"/>
130    <property name="loops.src.dir"        location="${basedir}/src/loops"/>    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
131    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
132    <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>    <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
133      <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
134      <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
135      <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
136    <property name="lib.dir"              location="${basedir}/lib"/>    <property name="lib.dir"              location="${basedir}/lib"/>
137    <property name="dist.dir"             location="${basedir}/dist"/>    <property name="dist.dir"             location="${basedir}/dist"/>
138    <property name="topsrc.dir"           location="${basedir}/src"/>    <property name="topsrc.dir"           location="${basedir}/src"/>
# Line 252  Line 255 
255    </macrodef>    </macrodef>
256    
257    <!-- Define jtreg test sets for different jdk versions -->    <!-- Define jtreg test sets for different jdk versions -->
258    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg9.src.dir}">
259      <patternset id="jdk9.jtreg.tests">      <patternset id="jdk9.jtreg.tests">
260        <include name="**/*.java"/>        <include name="**/*.java"/>
261      </patternset>      </patternset>
262    </fileset>    </fileset>
263    
264    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg8.src.dir}">
265      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
266        <include name="**/*.java"/>        <include name="**/*.java"/>
267        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="**/SpliteratorCharacteristics.java"/>
268          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
269          <exclude name="**/GCDuringIteration.java"/>
270      </patternset>      </patternset>
271    </fileset>    </fileset>
272    
273    <fileset dir="${jtreg.src.dir}">    <fileset dir="${jtreg7.src.dir}">
274      <patternset id="jdk7.jtreg.tests">      <patternset id="jdk7.jtreg.tests">
275        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="util/Collection/CollectionDefaults.java"/>  
       <exclude name="util/List/ListDefaults.java"/>  
       <exclude name="util/Spliterator/**/*.java"/>  
       <exclude name="util/concurrent/CompletableFuture/**/*.java"/>  
       <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>  
       <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>  
276      </patternset>      </patternset>
277    </fileset>    </fileset>
278    
279    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
280      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
     <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>  
281      <attribute name="source" default="7"/>      <attribute name="source" default="7"/>
282      <attribute name="target"/>      <attribute name="target"/>
283      <attribute name="workdir"/>      <attribute name="workdir"/>
# Line 290  Line 288 
288      <delete dir="@{workdir}/JTreport" quiet="true"/>      <delete dir="@{workdir}/JTreport" quiet="true"/>
289      <mkdir dir="@{workdir}/JTwork/scratch"/>      <mkdir dir="@{workdir}/JTwork/scratch"/>
290      <mkdir dir="@{workdir}/JTreport"/>      <mkdir dir="@{workdir}/JTreport"/>
291      <jtreg dir="@{jtreg.src.dir}"      <jtreg dir="${jtreg@{target}.src.dir}"
292             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
293             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
294             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
# Line 489  Line 487 
487            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
488    </target>    </target>
489    
490      <target name="jtreg8" description="Runs jtreg tests with jdk8">
491    
492        <antcall target="jtreg">
493          <param name="build.main.java.version" value="8"/>
494          <param name="build.main.javac" value="${javac8}"/>
495        </antcall>
496    
497      </target>
498    
499    <target name="test89"    <target name="test89"
500            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
501    
# Line 496  Line 503 
503      <antcall target="test">      <antcall target="test">
504        <param name="build.main.java.version" value="8"/>        <param name="build.main.java.version" value="8"/>
505        <param name="build.main.javac" value="${javac8}"/>        <param name="build.main.javac" value="${javac8}"/>
       <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>  
506      </antcall>      </antcall>
507    
508      <antcall target="clean"/>      <antcall target="clean"/>
# Line 573  Line 579 
579    
580        <include name="*.java"/>        <include name="*.java"/>
581        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
582        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
583        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>        <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
584        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
585    

Legend:
Removed from v.1.166  
changed lines
  Added in v.1.173

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