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.163 by jsr166, Fri Feb 20 22:33:13 2015 UTC vs.
Revision 1.171 by jsr166, Wed Sep 2 04:46:40 2015 UTC

#	Line 251 | 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="util/concurrent/forkjoin/SubmissionTest.java"/>
284	+	<exclude name="**/StampedLock/**/*.java"/>
285	+	<exclude name="**/AtomicReferenceTest.java"/>
286	+	<exclude name="util/concurrent/atomic/Serial.java"/>
287	+	</patternset>
288	+	</fileset>
289	+
290		<macrodef name="run-jtreg-tests">
291		<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
292		<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
#	Line 268 | Line 304
304		jdk="${jdk@{target}.home}"
305		workDir="@{workdir}/JTwork"
306		reportDir="@{workdir}/JTreport">
307	<
307	>	<patternset refid="jdk@{target}.jtreg.tests"/>
308		<arg value="-Xbootclasspath/p:@{classes}"/>
309		<arg value="-agentvm"/>
310		<arg value="-v:nopass,fail"/>
#	Line 319 | Line 355
355		<compilerarg value="-Xprefer:source"/>
356		<compilerarg value="-XDignore.symbol.file=true"/>
357		<compilerarg value="-Xlint:all"/>
358	+	<compilerarg value="-Werror"/>
359		<compilerarg value="-Xdoclint:all/protected"/>
360		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
361		<compilerarg line="${build.args}"/>
#	Line 462 | Line 499
499		description="Runs tck and jtreg tests for main">
500		</target>
501
502	+	<target name="jtreg8" description="Runs jtreg tests with jdk8">
503	+
504	+	<antcall target="jtreg">
505	+	<param name="build.main.java.version" value="8"/>
506	+	<param name="build.main.javac" value="${javac8}"/>
507	+	</antcall>
508	+
509	+	</target>
510	+
511		<target name="test89"
512		description="Runs tck and jtreg tests for main for multiple java versions">
513
#	Line 528 | Line 574
574		</target>
575
576
577	+	<target name="compile-test-loops" depends="jar"
578	+	description="compile all the perf tests in src/test/loops">
579	+
580	+	<mkdir dir="${build.dir}/test/loops"/>
581	+
582	+	<javac srcdir="${basedir}/src/test/loops"
583	+	destdir="${build.dir}/test/loops"
584	+	debug="${build.debug}"
585	+	debuglevel="${build.debuglevel}"
586	+	deprecation="${build.deprecation}"
587	+	includeAntRuntime="false"
588	+	includeJavaRuntime="false"
589	+	executable="${javac9}"
590	+	fork="true">
591	+
592	+	<include name="*.java"/>
593	+	<compilerarg value="-XDignore.symbol.file=true"/>
594	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
595	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
596	+	<compilerarg line="${build.args}"/>
597	+
598	+	</javac>
599	+
600	+	</target>
601	+
602	+
603		<!-- jsr166 4jdk7 -->
604
605		<target name="4jdk7compile"
#	Line 553 | Line 625
625		<compilerarg value="-Xprefer:source"/>
626		<compilerarg value="-XDignore.symbol.file=true"/>
627		<compilerarg value="-Xlint:all"/>
628	+	<compilerarg value="-Werror"/>
629		<compilerarg line="${build.args}"/>
630
631		</javac>
#	Line 657 | Line 730
730		<run-jtreg-tests
731		target="7"
732		workdir="${build.4jdk7.dir}"
733	<	classes="${4jdk7product.jar}"
661	<	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
733	>	classes="${4jdk7product.jar}"/>
734		</target>
735
736
#	Line 740 | Line 812
812		<include name="jsr166x/**/*.java"/>
813		<compilerarg value="-XDignore.symbol.file=true"/>
814		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
815	+	<compilerarg value="-Werror"/>
816		<compilerarg line="${build.args}"/>
817
818		</javac>
#	Line 826 | Line 899
899		<include name="jsr166y/**/*.java"/>
900		<compilerarg value="-XDignore.symbol.file=true"/>
901		<compilerarg value="-Xlint:all"/>
902	+	<compilerarg value="-Werror"/>
903		<compilerarg line="${build.args}"/>
904
905		</javac>
#	Line 913 | Line 987
987		<include name="extra166y/**/*.java"/>
988		<compilerarg value="-XDignore.symbol.file=true"/>
989		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
990	+	<compilerarg value="-Werror"/>
991		<compilerarg line="${build.args}"/>
992
993		</javac>
#	Line 1000 | Line 1075
1075		<include name="jsr166e/**/*.java"/>
1076		<compilerarg value="-XDignore.symbol.file=true"/>
1077		<compilerarg value="-Xlint:all"/>
1078	+	<compilerarg value="-Werror"/>
1079		<compilerarg line="${build.args}"/>
1080
1081		</javac>
#	Line 1026 | Line 1102
1102		<include name="jsr166e/**/*.java"/>
1103		<compilerarg value="-XDignore.symbol.file=true"/>
1104		<compilerarg value="-Xlint:all"/>
1105	+	<compilerarg value="-Werror"/>
1106		<compilerarg value="-Xdoclint:all/protected"/>
1107
1108		</javac>

Diff Legend

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