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

Diff of /jsr166/build.xml

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

revision 1.184 by jsr166, Wed Sep 30 15:30:46 2015 UTC revision 1.190 by jsr166, Thu Nov 5 17:18:53 2015 UTC
# Line 194  Line 194 
194    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195             classpath="${lib.dir}/jtreg.jar" />             classpath="${lib.dir}/jtreg.jar" />
196    
   <!-- Test classpath -->  
   <path id="test.classpath">  
     <pathelement location="${build.testcases.dir}"/>  
     <pathelement location="${junit.jar}"/>  
   </path>  
   
197    <!-- Tck options; see JSR166TestCase.java    <!-- Tck options; see JSR166TestCase.java
198     To profile a single tck test class:     To profile a single tck test class:
199     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
# Line 242  Line 236 
236    
237        <include name="*.java"/>        <include name="*.java"/>
238        <compilerarg value="-XDignore.symbol.file=true"/>        <compilerarg value="-XDignore.symbol.file=true"/>
239        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241        <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
242        <compilerarg line="${build.args}"/>        <compilerarg line="${build.args}"/>
# Line 305  Line 299 
299    
300      <sequential>      <sequential>
301    
302        <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
303        <property name="jtreg.verbose" value="nopass,fail,error"/>
304    
305      <local name="modules"/>      <local name="modules"/>
306      <condition property="modules">      <condition property="modules">
307        <available file="${jdk@{target}.home}/jmods" type="dir"/>        <available file="${jdk@{target}.home}/jmods" type="dir"/>
# Line 322  Line 319 
319        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>        <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
320        <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>        <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
321        <arg value="-agentvm"/>        <arg value="-agentvm"/>
322        <arg value="-v:nopass,fail"/>        <arg value="-verbose:${jtreg.verbose}"/>
323        <arg value="-vmoptions:-esa -ea"/>        <arg value="-vmoptions:-esa -ea"/>
324        <arg value="-automatic"/>        <arg value="-automatic"/>
325        <arg value="-k:!ignore"/>        <arg value="-k:!ignore"/>
# Line 654  Line 651 
651             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
652             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
653             source="6"             source="6"
654               target="6"
655             classpath=""             classpath=""
656             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
657             includeAntRuntime="false"             includeAntRuntime="false"
# Line 683  Line 681 
681             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
682             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
683             source="6"             source="6"
684               target="6"
685             classpath=""             classpath=""
686             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
687             includeAntRuntime="false"             includeAntRuntime="false"
688             includeJavaRuntime="false"             includeJavaRuntime="false"
689             executable="${javac8}"             executable="${javac8}"
# Line 850  Line 849 
849             classpath=""             classpath=""
850             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
851             source="5"             source="5"
852               target="5"
853             includeAntRuntime="false"             includeAntRuntime="false"
854             includeJavaRuntime="false"             includeJavaRuntime="false"
855             executable="${javac7}"             executable="${javac7}"
# Line 939  Line 939 
939             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
940             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
941             source="6"             source="6"
942               target="6"
943             classpath=""             classpath=""
944             bootclasspath="${bootclasspath6}"             bootclasspath="${bootclasspath6}"
945             includeAntRuntime="false"             includeAntRuntime="false"
# Line 1033  Line 1034 
1034             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"             bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1035             classpath=""             classpath=""
1036             source="6"             source="6"
1037               target="6"
1038             includeAntRuntime="false"             includeAntRuntime="false"
1039             includeJavaRuntime="false"             includeJavaRuntime="false"
1040             executable="${javac7}"             executable="${javac7}"
# Line 1124  Line 1126 
1126             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1127             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1128             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1129               target="${build.jsr166e.java.version}"
1130             classpath=""             classpath=""
1131             includeAntRuntime="false"             includeAntRuntime="false"
1132             includeJavaRuntime="false"             includeJavaRuntime="false"
# Line 1150  Line 1153 
1153             debuglevel="${build.debuglevel}"             debuglevel="${build.debuglevel}"
1154             deprecation="${build.deprecation}"             deprecation="${build.deprecation}"
1155             source="${build.jsr166e.java.version}"             source="${build.jsr166e.java.version}"
1156               target="${build.jsr166e.java.version}"
1157             classpath=""             classpath=""
1158             bootclasspath="${bootclasspath7}"             bootclasspath="${bootclasspath6}"
1159             includeAntRuntime="false"             includeAntRuntime="false"
1160             includeJavaRuntime="false"             includeJavaRuntime="false"
1161             executable="${javac8}"             executable="${javac8}"

Legend:
Removed from v.1.184  
changed lines
  Added in v.1.190

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