[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.224, Thu Nov 24 01:58:04 2016 UTC revision 1.229, Tue Dec 20 04:18:46 2016 UTC
# Line 1  Line 1 
1  <project name="jsr166" default="usage"  <project name="jsr166" default="usage"
2    xmlns:if="ant:if" xmlns:unless="ant:unless">    xmlns:if="ant:if" xmlns:unless="ant:unless"
3      xmlns:ivy="antlib:org.apache.ivy.ant">
4    
5    <description>    <description>
6  ------------------------------------------------------------------------------  ------------------------------------------------------------------------------
# Line 252  Line 253 
253        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
254        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256        <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>        <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
257        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
258        <javac-elements/>        <javac-elements/>
259    
# Line 263  Line 264 
264            jvm="${java@{target}}"            jvm="${java@{target}}"
265            fork="true">            fork="true">
266          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>          <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267          <jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>          <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
268            <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
269            <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
270            <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
271            <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
272          <jvmarg line="@{jvmflags}"/>          <jvmarg line="@{jvmflags}"/>
273          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->          <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
274          <jvmarg line="${vmoptions}" if:set="vmoptions"/>          <jvmarg line="${vmoptions}" if:set="vmoptions"/>
# Line 294  Line 299 
299    <fileset dir="${jtreg8.src.dir}">    <fileset dir="${jtreg8.src.dir}">
300      <patternset id="jdk8.jtreg.tests">      <patternset id="jdk8.jtreg.tests">
301        <include name="**/*.java"/>        <include name="**/*.java"/>
       <exclude name="**/SpliteratorCharacteristics.java"/>  
       <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->  
       <exclude name="**/GCDuringIteration.java"/>  
302      </patternset>      </patternset>
303    </fileset>    </fileset>
304    
# Line 333  Line 335 
335             workDir="@{workdir}/JTwork">             workDir="@{workdir}/JTwork">
336        <patternset refid="jdk@{target}.jtreg.tests"/>        <patternset refid="jdk@{target}.jtreg.tests"/>
337        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338        <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>        <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
339        <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>        <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
340        <arg value="-agentvm"/>        <arg value="-agentvm"/>
341        <arg value="-noreport"/>        <arg value="-noreport"/>
342        <arg value="-verbose:${jtreg.verbose}"/>        <arg value="-verbose:${jtreg.verbose}"/>
# Line 435  Line 437 
437    
438  <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->  <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439  <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->  <!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440    <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
441    <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
442    <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
443      <javadoc destdir="${docs.dir}"      <javadoc destdir="${docs.dir}"
444               packagenames="none"               packagenames="none"
445               link="${java9.api.url}"               link="${java9.api.url}"
# Line 1503  Line 1508 
1508      </antcall>      </antcall>
1509    </target>    </target>
1510    
1511    <!-- ==============================================================
1512      Running guava tests against jsr166 code
1513    =================================================================== -->
1514    
1515    <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1516    <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0-rc1"/> -->
1517    <!-- <property name="guava.version" value="20.0"/> -->
1518    
1519    <!-- HOWTO debug print a path id -->
1520    <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1521    <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1522    
1523    <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1524    <!--   organisation="com.google.guava" module="guava-tests"/> -->
1525    <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1526    <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1527    <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1528    <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1529    
1530    <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1531    <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1532    <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1533    <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1534    
1535    <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1536    <!--   type="*" inline="true" conf="*(private),*(public)" -->
1537    <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1538    <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1539    
1540    <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1541    <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1542    <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1543    
1544      <target name="init-ivy">
1545        <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1546             dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1547        <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1548                 classpath="${build.dir}/ivy.jar"/>
1549      </target>
1550    
1551      <target name="guava-tests" depends="jar, init-ivy"
1552              description="Guava tests run against jsr166 collections">
1553        <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1554        <mkdir dir="${guava.dir}"/>
1555        <ivy:retrieve pathid="guava.testlib.classpath"
1556          type="jar,bundle" inline="true" conf="default,master"
1557          pattern="${guava.dir}/[artifact].[ext]"
1558          organisation="com.google.guava" module="guava-testlib"/>
1559        <property name="guava.version" value="21.0-rc1"/>
1560        <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1561             dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1562        <junit printsummary="true" showoutput="true" haltonfailure="true"
1563               jvm="${java9}" fork="true">
1564          <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1565          <formatter type="brief"/>
1566          <classpath>
1567            <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1568            <path refid="guava.testlib.classpath"/>
1569          </classpath>
1570    
1571          <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1572          <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1573        </junit>
1574      </target>
1575    
1576  </project>  </project>

Legend:
Removed from v.1.224  
changed lines
  Added in v.1.229

Doug Lea
ViewVC Help
Powered by ViewVC 1.0.8