[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.170, Wed Sep 2 03:53:43 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="**/CompletableFuture/**/*.java"/>
277          <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278          <exclude name="**/StampedLock/**/*.java"/>
279          <exclude name="**/AtomicReferenceTest.java"/>
280          <exclude name="util/concurrent/atomic/Serial.java"/>
281        </patternset>
282      </fileset>
283    
284    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
285      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
286      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
# Line 268  Line 298 
298             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
299             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
300             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
301          <patternset refid="jdk@{target}.jtreg.tests"/>
302        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
303        <arg value="-agentvm"/>        <arg value="-agentvm"/>
304        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 463  Line 493 
493            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
494    </target>    </target>
495    
496      <target name="jtreg8" description="Runs jtreg tests with jdk8">
497    
498        <antcall target="jtreg">
499          <param name="build.main.java.version" value="8"/>
500          <param name="build.main.javac" value="${javac8}"/>
501        </antcall>
502    
503      </target>
504    
505    <target name="test89"    <target name="test89"
506            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
507    
# Line 529  Line 568 
568    </target>    </target>
569    
570    
571      <target name="compile-test-loops" depends="jar"
572              description="compile all the perf tests in src/test/loops">
573    
574        <mkdir dir="${build.dir}/test/loops"/>
575    
576        <javac srcdir="${basedir}/src/test/loops"
577               destdir="${build.dir}/test/loops"
578               debug="${build.debug}"
579               debuglevel="${build.debuglevel}"
580               deprecation="${build.deprecation}"
581               includeAntRuntime="false"
582               includeJavaRuntime="false"
583               executable="${javac9}"
584               fork="true">
585    
586          <include name="*.java"/>
587          <compilerarg value="-XDignore.symbol.file=true"/>
588          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
589          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
590          <compilerarg line="${build.args}"/>
591    
592        </javac>
593    
594      </target>
595    
596    
597    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
598    
599    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 659  Line 724 
724      <run-jtreg-tests      <run-jtreg-tests
725         target="7"         target="7"
726         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
727         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
728    </target>    </target>
729    
730    

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

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8