ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.182 by jsr166, Sun Sep 13 17:46:07 2015 UTC vs.
Revision 1.191 by jsr166, Fri Nov 6 00:12:54 2015 UTC

#	Line 57 | Line 57
57		<property name="build.deprecation"    value="false"/>
58		<property name="build.javadoc.access" value="protected"/>
59
60	–	<!-- Tck options; see JSR166TestCase.java
61	–	To profile a single tck test class:
62	–	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
63	–	To stress test a single tck test class:
64	–	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
65	–	-->
66	–	<property name="jsr166.profileTests"     value="false"/>
67	–	<property name="jsr166.profileThreshold" value="100"/>
68	–	<property name="jsr166.runsPerTest"      value="1"/>
69	–	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
70	–
60		<!-- Build locations -->
61		<property name="build.dir"                   location="build"/>
62		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 205 | Line 194
194		<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195		classpath="${lib.dir}/jtreg.jar" />
196
197	<	<!-- Test classpath -->
198	<	<path id="test.classpath">
199	<	<pathelement location="${build.testcases.dir}"/>
200	<	<pathelement location="${junit.jar}"/>
201	<	</path>
202	<
197	>	<!-- Tck options; see JSR166TestCase.java
198	>	To profile a single tck test class:
199	>	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
200	>	To stress test a single tck test class:
201	>	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
202	>	To stress test a single tck test method:
203	>	ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
204	>	-->
205	>	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
206		<macrodef name="run-tck-tests">
207		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
208		<attribute name="target"/>
#	Line 244 | Line 236
236
237		<include name="*.java"/>
238		<compilerarg value="-XDignore.symbol.file=true"/>
239	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
239	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241		<compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
242		<compilerarg line="${build.args}"/>
#	Line 261 | Line 253
253		<jvmarg line="@{jvmflags}"/>
254
255		<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256	<	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
256	>	<syspropertyset id="system-properties-used-by-tck">
257		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258	+	<propertyref prefix="jsr166."/>
259		</syspropertyset>
260
268	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
269	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
270	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
261		<classpath>
262		<pathelement location="${junit.jar}"/>
263		<pathelement location="@{workdir}/tck-classes"/>
#	Line 309 | Line 299
299
300		<sequential>
301
302	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
303	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
304	+
305		<local name="modules"/>
306		<condition property="modules">
307		<available file="${jdk@{target}.home}/jmods" type="dir"/>
#	Line 326 | Line 319
319		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
320		<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
321		<arg value="-agentvm"/>
322	<	<arg value="-v:nopass,fail"/>
322	>	<arg value="-verbose:${jtreg.verbose}"/>
323		<arg value="-vmoptions:-esa -ea"/>
324		<arg value="-automatic"/>
325		<arg value="-k:!ignore"/>
#	Line 603 | Line 596
596		debuglevel="${build.debuglevel}"
597		deprecation="${build.deprecation}"
598		source="${build.sourcelevel}"
599	+	target="${build.sourcelevel}"
600		fork="true">
601
602		<compilerarg line="${build.args}"/>
#	Line 658 | Line 652
652		debuglevel="${build.debuglevel}"
653		deprecation="${build.deprecation}"
654		source="6"
655	+	target="6"
656		classpath=""
657		bootclasspath="${bootclasspath6}"
658		includeAntRuntime="false"
#	Line 687 | Line 682
682		debuglevel="${build.debuglevel}"
683		deprecation="${build.deprecation}"
684		source="6"
685	+	target="6"
686		classpath=""
687	<	bootclasspath="${bootclasspath7}"
687	>	bootclasspath="${bootclasspath6}"
688		includeAntRuntime="false"
689		includeJavaRuntime="false"
690		executable="${javac8}"
#	Line 854 | Line 850
850		classpath=""
851		bootclasspath="${bootclasspath6}"
852		source="5"
853	+	target="5"
854		includeAntRuntime="false"
855		includeJavaRuntime="false"
856		executable="${javac7}"
#	Line 943 | Line 940
940		debuglevel="${build.debuglevel}"
941		deprecation="${build.deprecation}"
942		source="6"
943	+	target="6"
944		classpath=""
945		bootclasspath="${bootclasspath6}"
946		includeAntRuntime="false"
#	Line 1037 | Line 1035
1035		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1036		classpath=""
1037		source="6"
1038	+	target="6"
1039		includeAntRuntime="false"
1040		includeJavaRuntime="false"
1041		executable="${javac7}"
#	Line 1128 | Line 1127
1127		debuglevel="${build.debuglevel}"
1128		deprecation="${build.deprecation}"
1129		source="${build.jsr166e.java.version}"
1130	+	target="${build.jsr166e.java.version}"
1131		classpath=""
1132		includeAntRuntime="false"
1133		includeJavaRuntime="false"
#	Line 1154 | Line 1154
1154		debuglevel="${build.debuglevel}"
1155		deprecation="${build.deprecation}"
1156		source="${build.jsr166e.java.version}"
1157	+	target="${build.jsr166e.java.version}"
1158		classpath=""
1159	<	bootclasspath="${bootclasspath7}"
1159	>	bootclasspath="${bootclasspath6}"
1160		includeAntRuntime="false"
1161		includeJavaRuntime="false"
1162		executable="${javac8}"

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines