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.159 by jsr166, Fri Oct 3 23:18:13 2014 UTC vs.
Revision 1.172 by jsr166, Wed Sep 2 05:00:20 2015 UTC

#	Line 213 | Line 213
213		source="@{compile-target}"
214		target="@{compile-target}"
215		classpath="${junit.jar}"
216	–	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
216		includeAntRuntime="false"
217		includeJavaRuntime="false"
218		executable="${javac@{compile-target}}"
#	Line 222 | Line 221
221		<include name="*.java"/>
222		<compilerarg value="-XDignore.symbol.file=true"/>
223		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
224	+	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
225		<compilerarg line="${build.args}"/>
226		<javac-elements/>
227
#	Line 233 | Line 233
233		fork="true">
234		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
235		<jvmarg line="@{jvmflags}"/>
236	+
237	+	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
238	+	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
239	+	<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
240	+	</syspropertyset>
241	+
242		<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243		<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244		<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
#	Line 245 | Line 251
251		</sequential>
252		</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="**/LinkedTransferQueue/SpliteratorTraverseAddRemoveTest.java"/>
284	+	<exclude name="**/forkjoin/SubmissionTest.java"/>
285	+	<exclude name="**/StampedLock/**/*.java"/>
286	+	<exclude name="**/AtomicReferenceTest.java"/>
287	+	<exclude name="util/concurrent/atomic/Serial.java"/>
288	+	</patternset>
289	+	</fileset>
290	+
291		<macrodef name="run-jtreg-tests">
292		<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
293		<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
#	Line 262 | Line 305
305		jdk="${jdk@{target}.home}"
306		workDir="@{workdir}/JTwork"
307		reportDir="@{workdir}/JTreport">
308	<
308	>	<patternset refid="jdk@{target}.jtreg.tests"/>
309		<arg value="-Xbootclasspath/p:@{classes}"/>
310		<arg value="-agentvm"/>
311		<arg value="-v:nopass,fail"/>
#	Line 313 | Line 356
356		<compilerarg value="-Xprefer:source"/>
357		<compilerarg value="-XDignore.symbol.file=true"/>
358		<compilerarg value="-Xlint:all"/>
359	+	<compilerarg value="-Werror"/>
360		<compilerarg value="-Xdoclint:all/protected"/>
361		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
362		<compilerarg line="${build.args}"/>
#	Line 416 | Line 460
460		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
461		</target>
462
463	<
463	>	<target name="tck" depends="test-tck" description="alias for test-tck"/>
464		<target name="test-tck"
465		depends="jar"
466		description="Runs tck tests for main directly">
#	Line 427 | Line 471
471		classes="${product.jar}"/>
472		</target>
473
474	+	<target name="test-tck-parallelism-1"
475	+	description="Runs test-tck with given common pool parallelism">
476	+	<antcall target="test-tck">
477	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
478	+	</antcall>
479	+	</target>
480	+
481	+	<target name="test-tck-parallelism-0"
482	+	description="Runs test-tck with given common pool parallelism">
483	+	<antcall target="test-tck">
484	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
485	+	</antcall>
486	+	</target>
487	+
488	+	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
489		<target name="test-jtreg"
490		depends="jar"
491		description="Runs jtreg tests for main using the jtreg ant task">
#	Line 437 | Line 496
496		</target>
497
498		<target name="test"
499	<	depends="test-tck, test-jtreg"
499	>	depends="test-tck, test-tck-parallelism-1, test-jtreg"
500		description="Runs tck and jtreg tests for main">
501		</target>
502
503	+	<target name="jtreg8" description="Runs jtreg tests with jdk8">
504	+
505	+	<antcall target="jtreg">
506	+	<param name="build.main.java.version" value="8"/>
507	+	<param name="build.main.javac" value="${javac8}"/>
508	+	</antcall>
509	+
510	+	</target>
511	+
512		<target name="test89"
513		description="Runs tck and jtreg tests for main for multiple java versions">
514
#	Line 507 | Line 575
575		</target>
576
577
578	+	<target name="compile-test-loops" depends="jar"
579	+	description="compile all the perf tests in src/test/loops">
580	+
581	+	<mkdir dir="${build.dir}/test/loops"/>
582	+
583	+	<javac srcdir="${basedir}/src/test/loops"
584	+	destdir="${build.dir}/test/loops"
585	+	debug="${build.debug}"
586	+	debuglevel="${build.debuglevel}"
587	+	deprecation="${build.deprecation}"
588	+	includeAntRuntime="false"
589	+	includeJavaRuntime="false"
590	+	executable="${javac9}"
591	+	fork="true">
592	+
593	+	<include name="*.java"/>
594	+	<compilerarg value="-XDignore.symbol.file=true"/>
595	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
596	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
597	+	<compilerarg line="${build.args}"/>
598	+
599	+	</javac>
600	+
601	+	</target>
602	+
603	+
604		<!-- jsr166 4jdk7 -->
605
606		<target name="4jdk7compile"
#	Line 532 | Line 626
626		<compilerarg value="-Xprefer:source"/>
627		<compilerarg value="-XDignore.symbol.file=true"/>
628		<compilerarg value="-Xlint:all"/>
629	+	<compilerarg value="-Werror"/>
630		<compilerarg line="${build.args}"/>
631
632		</javac>
#	Line 636 | Line 731
731		<run-jtreg-tests
732		target="7"
733		workdir="${build.4jdk7.dir}"
734	<	classes="${4jdk7product.jar}"
640	<	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
734	>	classes="${4jdk7product.jar}"/>
735		</target>
736
737
#	Line 719 | Line 813
813		<include name="jsr166x/**/*.java"/>
814		<compilerarg value="-XDignore.symbol.file=true"/>
815		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
816	+	<compilerarg value="-Werror"/>
817		<compilerarg line="${build.args}"/>
818
819		</javac>
#	Line 805 | Line 900
900		<include name="jsr166y/**/*.java"/>
901		<compilerarg value="-XDignore.symbol.file=true"/>
902		<compilerarg value="-Xlint:all"/>
903	+	<compilerarg value="-Werror"/>
904		<compilerarg line="${build.args}"/>
905
906		</javac>
#	Line 892 | Line 988
988		<include name="extra166y/**/*.java"/>
989		<compilerarg value="-XDignore.symbol.file=true"/>
990		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
991	+	<compilerarg value="-Werror"/>
992		<compilerarg line="${build.args}"/>
993
994		</javac>
#	Line 979 | Line 1076
1076		<include name="jsr166e/**/*.java"/>
1077		<compilerarg value="-XDignore.symbol.file=true"/>
1078		<compilerarg value="-Xlint:all"/>
1079	+	<compilerarg value="-Werror"/>
1080		<compilerarg line="${build.args}"/>
1081
1082		</javac>
#	Line 1005 | Line 1103
1103		<include name="jsr166e/**/*.java"/>
1104		<compilerarg value="-XDignore.symbol.file=true"/>
1105		<compilerarg value="-Xlint:all"/>
1106	+	<compilerarg value="-Werror"/>
1107		<compilerarg value="-Xdoclint:all/protected"/>
1108
1109		</javac>
#	Line 1108 | Line 1207
1207
1208		<target name="lint">
1209		<antcall target="dists">
1210	+	<param name="build.javadoc.access" value="public"/>
1211	+	</antcall>
1212	+	</target>
1213	+
1214	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1215	+	<target name="lint-private">
1216	+	<antcall target="dist">
1217		<param name="build.javadoc.access" value="private"/>
1218		</antcall>
1219		</target>

Diff Legend

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