[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.164, Wed May 20 06:13:09 2015 UTC revision 1.165, Wed Jun 17 01:55:44 2015 UTC
# Line 251  Line 251 
251      </sequential>      </sequential>
252    </macrodef>    </macrodef>
253    
254      <!-- Define jtreg test sets for different jdk versions -->
255      <fileset dir="${jtreg.src.dir}">
256        <patternset id="jdk9.jtreg.tests">
257          <include name="**/*.java"/>
258        </patternset>
259      </fileset>
260    
261      <fileset dir="${jtreg.src.dir}">
262        <patternset id="jdk8.jtreg.tests">
263          <include name="**/*.java"/>
264          <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265        </patternset>
266      </fileset>
267    
268      <fileset dir="${jtreg.src.dir}">
269        <patternset id="jdk7.jtreg.tests">
270          <include name="**/*.java"/>
271          <exclude name="util/Collection/CollectionDefaults.java"/>
272          <exclude name="util/List/ListDefaults.java"/>
273          <exclude name="util/Spliterator/**/*.java"/>
274          <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
275          <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
276          <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
277        </patternset>
278      </fileset>
279    
280    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
281      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
282      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
# Line 268  Line 294 
294             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
295             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
296             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
297          <patternset refid="jdk@{target}.jtreg.tests"/>
298        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
299        <arg value="-agentvm"/>        <arg value="-agentvm"/>
300        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 470  Line 496 
496      <antcall target="test">      <antcall target="test">
497        <param name="build.main.java.version" value="8"/>        <param name="build.main.java.version" value="8"/>
498        <param name="build.main.javac" value="${javac8}"/>        <param name="build.main.javac" value="${javac8}"/>
499          <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
500      </antcall>      </antcall>
501    
502      <antcall target="clean"/>      <antcall target="clean"/>
# Line 659  Line 686 
686      <run-jtreg-tests      <run-jtreg-tests
687         target="7"         target="7"
688         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
689         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
690    </target>    </target>
691    
692    

Legend:
Removed from v.1.164  
changed lines
  Added in v.1.165

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8