/[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.169 by jsr166, Wed Sep 2 03:45:13 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 274  Line 276 
276        <exclude name="util/concurrent/CompletableFuture/**/*.java"/>        <exclude name="util/concurrent/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="util/concurrent/locks/StampedLock/**/*.java"/>
279          <exclude name="util/concurrent/atomic/Serial.java"/>
280      </patternset>      </patternset>
281    </fileset>    </fileset>
282    
# Line 489  Line 492 
492            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
493    </target>    </target>
494    
495      <target name="jtreg8" description="Runs jtreg tests with jdk8">
496    
497        <antcall target="jtreg">
498          <param name="build.main.java.version" value="8"/>
499          <param name="build.main.javac" value="${javac8}"/>
500        </antcall>
501    
502      </target>
503    
504    <target name="test89"    <target name="test89"
505            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
506    
# Line 496  Line 508 
508      <antcall target="test">      <antcall target="test">
509        <param name="build.main.java.version" value="8"/>        <param name="build.main.java.version" value="8"/>
510        <param name="build.main.javac" value="${javac8}"/>        <param name="build.main.javac" value="${javac8}"/>
       <param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>  
511      </antcall>      </antcall>
512    
513      <antcall target="clean"/>      <antcall target="clean"/>
# Line 556  Line 567 
567    </target>    </target>
568    
569    
570      <target name="compile-test-loops" depends="jar"
571              description="compile all the perf tests in src/test/loops">
572    
573        <mkdir dir="${build.dir}/test/loops"/>
574    
575        <javac srcdir="${basedir}/src/test/loops"
576               destdir="${build.dir}/test/loops"
577               debug="${build.debug}"
578               debuglevel="${build.debuglevel}"
579               deprecation="${build.deprecation}"
580               includeAntRuntime="false"
581               includeJavaRuntime="false"
582               executable="${javac9}"
583               fork="true">
584    
585          <include name="*.java"/>
586          <compilerarg value="-XDignore.symbol.file=true"/>
587          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
588          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
589          <compilerarg line="${build.args}"/>
590    
591        </javac>
592    
593      </target>
594    
595    
596    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
597    
598    <target name="4jdk7compile"    <target name="4jdk7compile"

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

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