[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.168, Wed Sep 2 02:14:59 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          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266          <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
267        </patternset>
268      </fileset>
269    
270      <fileset dir="${jtreg.src.dir}">
271        <patternset id="jdk7.jtreg.tests">
272          <include name="**/*.java"/>
273          <exclude name="util/Collection/CollectionDefaults.java"/>
274          <exclude name="util/List/ListDefaults.java"/>
275          <exclude name="util/Spliterator/**/*.java"/>
276          <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
277          <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278          <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
279        </patternset>
280      </fileset>
281    
282    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
283      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
284      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
# Line 268  Line 296 
296             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
297             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
298             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
299          <patternset refid="jdk@{target}.jtreg.tests"/>
300        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
301        <arg value="-agentvm"/>        <arg value="-agentvm"/>
302        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 463  Line 491 
491            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
492    </target>    </target>
493    
494      <target name="jtreg8" description="Runs jtreg tests with jdk8">
495    
496        <antcall target="jtreg">
497          <param name="build.main.java.version" value="8"/>
498          <param name="build.main.javac" value="${javac8}"/>
499        </antcall>
500    
501      </target>
502    
503    <target name="test89"    <target name="test89"
504            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
505    
# Line 529  Line 566 
566    </target>    </target>
567    
568    
569      <target name="compile-test-loops" depends="jar"
570              description="compile all the perf tests in src/test/loops">
571    
572        <mkdir dir="${build.dir}/test/loops"/>
573    
574        <javac srcdir="${basedir}/src/test/loops"
575               destdir="${build.dir}/test/loops"
576               debug="${build.debug}"
577               debuglevel="${build.debuglevel}"
578               deprecation="${build.deprecation}"
579               includeAntRuntime="false"
580               includeJavaRuntime="false"
581               executable="${javac9}"
582               fork="true">
583    
584          <include name="*.java"/>
585          <compilerarg value="-XDignore.symbol.file=true"/>
586          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
587          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
588          <compilerarg line="${build.args}"/>
589    
590        </javac>
591    
592      </target>
593    
594    
595    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
596    
597    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 659  Line 722 
722      <run-jtreg-tests      <run-jtreg-tests
723         target="7"         target="7"
724         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
725         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
726    </target>    </target>
727    
728    

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8