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

Diff of /jsr166/build.xml

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

revision 1.165 by jsr166, Wed Jun 17 01:55:44 2015 UTC revision 1.172 by jsr166, Wed Sep 2 05:00:20 2015 UTC
# Line 262  Line 262 
262      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
263        <include name="**/*.java"/>        <include name="**/*.java"/>
264        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>        <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
265          <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
266          <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
267      </patternset>      </patternset>
268    </fileset>    </fileset>
269    
# Line 271  Line 273 
273        <exclude name="util/Collection/CollectionDefaults.java"/>        <exclude name="util/Collection/CollectionDefaults.java"/>
274        <exclude name="util/List/ListDefaults.java"/>        <exclude name="util/List/ListDefaults.java"/>
275        <exclude name="util/Spliterator/**/*.java"/>        <exclude name="util/Spliterator/**/*.java"/>
276        <exclude name="util/concurrent/CompletableFuture/**/*.java"/>        <exclude name="**/CompletableFuture/**/*.java"/>
277        <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>        <exclude name="**/ConcurrentAssociateTest.java"/>
278        <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>        <exclude name="**/ConcurrentContainsKeyTest.java"/>
279          <exclude name="**/ConcurrentHashMap/ToArray.java"/>
280          <exclude name="**/ConcurrentRemoveIf.java"/>
281          <exclude name="**/COWSubList.java"/>
282          <exclude name="**/FutureTask/NegativeTimeout.java"/>
283          <exclude name="**/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java"/>
284          <exclude name="**/forkjoin/SubmissionTest.java"/>
285          <exclude name="**/StampedLock/**/*.java"/>
286          <exclude name="**/AtomicReferenceTest.java"/>
287          <exclude name="util/concurrent/atomic/Serial.java"/>
288      </patternset>      </patternset>
289    </fileset>    </fileset>
290    
# Line 489  Line 500 
500            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
501    </target>    </target>
502    
503      <target name="jtreg8" description="Runs jtreg tests with jdk8">
504    
505        <antcall target="jtreg">
506          <param name="build.main.java.version" value="8"/>
507          <param name="build.main.javac" value="${javac8}"/>
508        </antcall>
509    
510      </target>
511    
512    <target name="test89"    <target name="test89"
513            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
514    
# Line 496  Line 516 
516      <antcall target="test">      <antcall target="test">
517        <param name="build.main.java.version" value="8"/>        <param name="build.main.java.version" value="8"/>
518        <param name="build.main.javac" value="${javac8}"/>        <param name="build.main.javac" value="${javac8}"/>
       <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>  
519      </antcall>      </antcall>
520    
521      <antcall target="clean"/>      <antcall target="clean"/>
# Line 556  Line 575 
575    </target>    </target>
576    
577    
578      <target name="compile-test-loops" depends="jar"
579              description="compile all the perf tests in src/test/loops">
580    
581        <mkdir dir="${build.dir}/test/loops"/>
582    
583        <javac srcdir="${basedir}/src/test/loops"
584               destdir="${build.dir}/test/loops"
585               debug="${build.debug}"
586               debuglevel="${build.debuglevel}"
587               deprecation="${build.deprecation}"
588               includeAntRuntime="false"
589               includeJavaRuntime="false"
590               executable="${javac9}"
591               fork="true">
592    
593          <include name="*.java"/>
594          <compilerarg value="-XDignore.symbol.file=true"/>
595          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
596          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
597          <compilerarg line="${build.args}"/>
598    
599        </javac>
600    
601      </target>
602    
603    
604    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
605    
606    <target name="4jdk7compile"    <target name="4jdk7compile"
Legend:
Removed from v.1.165  
changed lines
  Added in v.1.172
dl@cs.oswego.edu
 ViewVC Help
Powered by ViewVC 1.1.27