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

Diff of /jsr166/build.xml

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

revision 1.161 by jsr166, Sat Jan 17 23:12:49 2015 UTC revision 1.171 by jsr166, Wed Sep 2 04:46:40 2015 UTC
# Line 213  Line 213 
213             source="@{compile-target}"             source="@{compile-target}"
214             target="@{compile-target}"             target="@{compile-target}"
215             classpath="${junit.jar}"             classpath="${junit.jar}"
            bootclasspath="@{classes}:${bootclasspath@{compile-target}}"  
216             includeAntRuntime="false"             includeAntRuntime="false"
217             includeJavaRuntime="false"             includeJavaRuntime="false"
218             executable="${javac@{compile-target}}"             executable="${javac@{compile-target}}"
# Line 222  Line 221 
221        <include name="*.java"/>        <include name="*.java"/>
222        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
223        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224          <compilerarg value="-Xbootclasspath/p:@{classes}"/>
225        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
226        <javac-elements/>        <javac-elements/>
227    
# 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="**/ConcurrentAssociateTest.java"/>
278          <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="util/concurrent/forkjoin/SubmissionTest.java"/>
284          <exclude name="**/StampedLock/**/*.java"/>
285          <exclude name="**/AtomicReferenceTest.java"/>
286          <exclude name="util/concurrent/atomic/Serial.java"/>
287        </patternset>
288      </fileset>
289    
290    <macrodef name="run-jtreg-tests">    <macrodef name="run-jtreg-tests">
291      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->      <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
292      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>      <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
# Line 268  Line 304 
304             jdk="${jdk@{target}.home}"             jdk="${jdk@{target}.home}"
305             workDir="@{workdir}/JTwork"             workDir="@{workdir}/JTwork"
306             reportDir="@{workdir}/JTreport">             reportDir="@{workdir}/JTreport">
307          <patternset refid="jdk@{target}.jtreg.tests"/>
308        <arg value="-Xbootclasspath/p:@{classes}"/>        <arg value="-Xbootclasspath/p:@{classes}"/>
309        <arg value="-agentvm"/>        <arg value="-agentvm"/>
310        <arg value="-v:nopass,fail"/>        <arg value="-v:nopass,fail"/>
# Line 319  Line 355 
355        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
356        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
357        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
358          <compilerarg value="-Werror"/>
359        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
360        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
361        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 422  Line 459 
459      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
460    </target>    </target>
461    
462      <target name="tck" depends="test-tck" description="alias for test-tck"/>
463    <target name="test-tck"    <target name="test-tck"
464            depends="jar"            depends="jar"
465            description="Runs tck tests for main directly">            description="Runs tck tests for main directly">
# Line 447  Line 484 
484      </antcall>      </antcall>
485    </target>    </target>
486    
487      <target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
488    <target name="test-jtreg"    <target name="test-jtreg"
489            depends="jar"            depends="jar"
490            description="Runs jtreg tests for main using the jtreg ant task">            description="Runs jtreg tests for main using the jtreg ant task">
# Line 461  Line 499 
499            description="Runs tck and jtreg tests for main">            description="Runs tck and jtreg tests for main">
500    </target>    </target>
501    
502      <target name="jtreg8" description="Runs jtreg tests with jdk8">
503    
504        <antcall target="jtreg">
505          <param name="build.main.java.version" value="8"/>
506          <param name="build.main.javac" value="${javac8}"/>
507        </antcall>
508    
509      </target>
510    
511    <target name="test89"    <target name="test89"
512            description="Runs tck and jtreg tests for main for multiple java versions">            description="Runs tck and jtreg tests for main for multiple java versions">
513    
# Line 527  Line 574 
574    </target>    </target>
575    
576    
577      <target name="compile-test-loops" depends="jar"
578              description="compile all the perf tests in src/test/loops">
579    
580        <mkdir dir="${build.dir}/test/loops"/>
581    
582        <javac srcdir="${basedir}/src/test/loops"
583               destdir="${build.dir}/test/loops"
584               debug="${build.debug}"
585               debuglevel="${build.debuglevel}"
586               deprecation="${build.deprecation}"
587               includeAntRuntime="false"
588               includeJavaRuntime="false"
589               executable="${javac9}"
590               fork="true">
591    
592          <include name="*.java"/>
593          <compilerarg value="-XDignore.symbol.file=true"/>
594          <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
595          <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
596          <compilerarg line="${build.args}"/>
597    
598        </javac>
599    
600      </target>
601    
602    
603    <!-- jsr166 4jdk7 -->    <!-- jsr166 4jdk7 -->
604    
605    <target name="4jdk7compile"    <target name="4jdk7compile"
# Line 552  Line 625 
625        <compilerarg value="-Xprefer:source"/>        <compilerarg value="-Xprefer:source"/>
626        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
627        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
628          <compilerarg value="-Werror"/>
629        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
630    
631      </javac>      </javac>
# Line 656  Line 730 
730      <run-jtreg-tests      <run-jtreg-tests
731         target="7"         target="7"
732         workdir="${build.4jdk7.dir}"         workdir="${build.4jdk7.dir}"
733         classes="${4jdk7product.jar}"         classes="${4jdk7product.jar}"/>
        jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>  
734    </target>    </target>
735    
736    
# Line 739  Line 812 
812        <include name="jsr166x/**/*.java"/>        <include name="jsr166x/**/*.java"/>
813        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
814        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
815          <compilerarg value="-Werror"/>
816        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
817    
818      </javac>      </javac>
# Line 825  Line 899 
899        <include name="jsr166y/**/*.java"/>        <include name="jsr166y/**/*.java"/>
900        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
901        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
902          <compilerarg value="-Werror"/>
903        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
904    
905      </javac>      </javac>
# Line 912  Line 987 
987        <include name="extra166y/**/*.java"/>        <include name="extra166y/**/*.java"/>
988        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
989        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
990          <compilerarg value="-Werror"/>
991        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
992    
993      </javac>      </javac>
# Line 999  Line 1075 
1075        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1076        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1077        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1078          <compilerarg value="-Werror"/>
1079        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
1080    
1081      </javac>      </javac>
# Line 1025  Line 1102 
1102        <include name="jsr166e/**/*.java"/>        <include name="jsr166e/**/*.java"/>
1103        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
1104        <compilerarg value="-Xlint:all"/>        <compilerarg value="-Xlint:all"/>
1105          <compilerarg value="-Werror"/>
1106        <compilerarg value="-Xdoclint:all/protected"/>        <compilerarg value="-Xdoclint:all/protected"/>
1107    
1108      </javac>      </javac>

Legend:
Removed from v.1.161  
changed lines
  Added in v.1.171

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