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.193 by jsr166, Fri Dec 11 23:58:52 2015 UTC vs.
Revision 1.196 by jsr166, Sat Jan 2 21:02:44 2016 UTC

#	Line 238 | Line 238
238		<compilerarg value="-XDignore.symbol.file=true"/>
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"/>
241	>	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
242		<compilerarg line="${build.args}"/>
243		<javac-elements/>
244
#	Line 249 | Line 249
249		jvm="${java@{target}}"
250		fork="true">
251		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
252	<	<jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
252	>	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
253		<jvmarg line="@{jvmflags}"/>
254
255		<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
#	Line 289 | Line 289
289		</patternset>
290		</fileset>
291
292	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
293	+	<property name="jtreg.flags" value=""/>
294	+
295		<macrodef name="run-jtreg-tests">
296		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
297		<attribute name="source" default="7"/>
#	Line 319 | Line 322
322		reportDir="@{workdir}/JTreport">
323		<patternset refid="jdk@{target}.jtreg.tests"/>
324		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
325	<	<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
325	>	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
326		<arg value="-agentvm"/>
327		<arg value="-verbose:${jtreg.verbose}"/>
328		<arg value="-vmoptions:-esa -ea"/>
329		<arg value="-automatic"/>
330		<arg value="-k:!ignore"/>
331		<arg line="@{jtregflags}"/>
332	+	<arg line="${jtreg.flags}"/>
333		</jtreg>
334		</sequential>
335		</macrodef>
#	Line 388 | Line 392
392		<compilerarg line="${build.args}"/>
393
394		</javac>
395	+
396	+	<!-- We need jdk9's Contended annotation, but at compile time only -->
397	+	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
398		</target>
399
400

Diff Legend

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