/[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.170 by jsr166, Wed Sep 2 03:53:43 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="util/concurrent/forkjoin/SubmissionTest.java"/>
278        <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>        <exclude name="**/StampedLock/**/*.java"/>
279          <exclude name="**/AtomicReferenceTest.java"/>
280          <exclude name="util/concurrent/atomic/Serial.java"/>
281      </patternset>      </patternset>
282    </fileset>    </fileset>
283    
# Line 489  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 496  Line 509 
509      <antcall target="test">      <antcall target="test">
510        <param name="build.main.java.version" value="8"/>        <param name="build.main.java.version" value="8"/>
511        <param name="build.main.javac" value="${javac8}"/>        <param name="build.main.javac" value="${javac8}"/>
       <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>  
512      </antcall>      </antcall>
513    
514      <antcall target="clean"/>      <antcall target="clean"/>
# Line 556  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"

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

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