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.169 by jsr166, Wed Sep 2 03:45:13 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="util/concurrent/CompletableFuture/**/*.java"/>
277	+	<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278	+	<exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
279	+	<exclude name="util/concurrent/atomic/Serial.java"/>
280	+	</patternset>
281	+	</fileset>
282	+
283		<macrodef name="run-jtreg-tests">
284		<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
285		<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
#	Line 262 | Line 297
297		jdk="${jdk@{target}.home}"
298		workDir="@{workdir}/JTwork"
299		reportDir="@{workdir}/JTreport">
300	<
300	>	<patternset refid="jdk@{target}.jtreg.tests"/>
301		<arg value="-Xbootclasspath/p:@{classes}"/>
302		<arg value="-agentvm"/>
303		<arg value="-v:nopass,fail"/>
#	Line 313 | Line 348
348		<compilerarg value="-Xprefer:source"/>
349		<compilerarg value="-XDignore.symbol.file=true"/>
350		<compilerarg value="-Xlint:all"/>
351	+	<compilerarg value="-Werror"/>
352		<compilerarg value="-Xdoclint:all/protected"/>
353		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
354		<compilerarg line="${build.args}"/>
#	Line 416 | Line 452
452		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
453		</target>
454
455	<
455	>	<target name="tck" depends="test-tck" description="alias for test-tck"/>
456		<target name="test-tck"
457		depends="jar"
458		description="Runs tck tests for main directly">
#	Line 427 | Line 463
463		classes="${product.jar}"/>
464		</target>
465
466	+	<target name="test-tck-parallelism-1"
467	+	description="Runs test-tck with given common pool parallelism">
468	+	<antcall target="test-tck">
469	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
470	+	</antcall>
471	+	</target>
472	+
473	+	<target name="test-tck-parallelism-0"
474	+	description="Runs test-tck with given common pool parallelism">
475	+	<antcall target="test-tck">
476	+	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
477	+	</antcall>
478	+	</target>
479	+
480	+	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
481		<target name="test-jtreg"
482		depends="jar"
483		description="Runs jtreg tests for main using the jtreg ant task">
#	Line 437 | Line 488
488		</target>
489
490		<target name="test"
491	<	depends="test-tck, test-jtreg"
491	>	depends="test-tck, test-tck-parallelism-1, test-jtreg"
492		description="Runs tck and jtreg tests for main">
493		</target>
494
495	+	<target name="jtreg8" description="Runs jtreg tests with jdk8">
496	+
497	+	<antcall target="jtreg">
498	+	<param name="build.main.java.version" value="8"/>
499	+	<param name="build.main.javac" value="${javac8}"/>
500	+	</antcall>
501	+
502	+	</target>
503	+
504		<target name="test89"
505		description="Runs tck and jtreg tests for main for multiple java versions">
506
#	Line 507 | Line 567
567		</target>
568
569
570	+	<target name="compile-test-loops" depends="jar"
571	+	description="compile all the perf tests in src/test/loops">
572	+
573	+	<mkdir dir="${build.dir}/test/loops"/>
574	+
575	+	<javac srcdir="${basedir}/src/test/loops"
576	+	destdir="${build.dir}/test/loops"
577	+	debug="${build.debug}"
578	+	debuglevel="${build.debuglevel}"
579	+	deprecation="${build.deprecation}"
580	+	includeAntRuntime="false"
581	+	includeJavaRuntime="false"
582	+	executable="${javac9}"
583	+	fork="true">
584	+
585	+	<include name="*.java"/>
586	+	<compilerarg value="-XDignore.symbol.file=true"/>
587	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
588	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
589	+	<compilerarg line="${build.args}"/>
590	+
591	+	</javac>
592	+
593	+	</target>
594	+
595	+
596		<!-- jsr166 4jdk7 -->
597
598		<target name="4jdk7compile"
#	Line 532 | Line 618
618		<compilerarg value="-Xprefer:source"/>
619		<compilerarg value="-XDignore.symbol.file=true"/>
620		<compilerarg value="-Xlint:all"/>
621	+	<compilerarg value="-Werror"/>
622		<compilerarg line="${build.args}"/>
623
624		</javac>
#	Line 636 | Line 723
723		<run-jtreg-tests
724		target="7"
725		workdir="${build.4jdk7.dir}"
726	<	classes="${4jdk7product.jar}"
640	<	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
726	>	classes="${4jdk7product.jar}"/>
727		</target>
728
729
#	Line 719 | Line 805
805		<include name="jsr166x/**/*.java"/>
806		<compilerarg value="-XDignore.symbol.file=true"/>
807		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
808	+	<compilerarg value="-Werror"/>
809		<compilerarg line="${build.args}"/>
810
811		</javac>
#	Line 805 | Line 892
892		<include name="jsr166y/**/*.java"/>
893		<compilerarg value="-XDignore.symbol.file=true"/>
894		<compilerarg value="-Xlint:all"/>
895	+	<compilerarg value="-Werror"/>
896		<compilerarg line="${build.args}"/>
897
898		</javac>
#	Line 892 | Line 980
980		<include name="extra166y/**/*.java"/>
981		<compilerarg value="-XDignore.symbol.file=true"/>
982		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
983	+	<compilerarg value="-Werror"/>
984		<compilerarg line="${build.args}"/>
985
986		</javac>
#	Line 979 | Line 1068
1068		<include name="jsr166e/**/*.java"/>
1069		<compilerarg value="-XDignore.symbol.file=true"/>
1070		<compilerarg value="-Xlint:all"/>
1071	+	<compilerarg value="-Werror"/>
1072		<compilerarg line="${build.args}"/>
1073
1074		</javac>
#	Line 1005 | Line 1095
1095		<include name="jsr166e/**/*.java"/>
1096		<compilerarg value="-XDignore.symbol.file=true"/>
1097		<compilerarg value="-Xlint:all"/>
1098	+	<compilerarg value="-Werror"/>
1099		<compilerarg value="-Xdoclint:all/protected"/>
1100
1101		</javac>
#	Line 1108 | Line 1199
1199
1200		<target name="lint">
1201		<antcall target="dists">
1202	+	<param name="build.javadoc.access" value="public"/>
1203	+	</antcall>
1204	+	</target>
1205	+
1206	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1207	+	<target name="lint-private">
1208	+	<antcall target="dist">
1209		<param name="build.javadoc.access" value="private"/>
1210		</antcall>
1211		</target>

Diff Legend

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