44 |
|
<property name="build.deprecation" value="false"/> |
45 |
|
<property name="build.javadoc.access" value="protected"/> |
46 |
|
|
47 |
+ |
<!-- Tck options; see JSR166TestCase.java --> |
48 |
+ |
<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck --> |
49 |
+ |
<property name="jsr166.profileTests" value="false"/> |
50 |
+ |
<property name="jsr166.profileThreshold" value="100"/> |
51 |
+ |
<property name="jsr166.runsPerTest" value="1"/> |
52 |
+ |
<!-- Allow running an individual tck test class --> |
53 |
+ |
<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck --> |
54 |
+ |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
55 |
+ |
|
56 |
|
<!-- Build locations --> |
57 |
|
<property name="build.dir" location="build"/> |
58 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
179 |
|
|
180 |
|
<macrodef name="run-tck-tests"> |
181 |
|
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
173 |
– |
<attribute name="source" default="6"/> |
182 |
|
<attribute name="target"/> |
183 |
+ |
<attribute name="compile-target" default="@{target}"/> |
184 |
|
<attribute name="workdir"/> |
185 |
|
<attribute name="classes"/> |
186 |
|
<attribute name="jvmflags" default=""/> |
194 |
|
debug="${build.debug}" |
195 |
|
debuglevel="${build.debuglevel}" |
196 |
|
deprecation="${build.deprecation}" |
197 |
< |
source="@{source}" |
197 |
> |
source="@{compile-target}" |
198 |
> |
target="@{compile-target}" |
199 |
|
classpath="${junit.jar}" |
200 |
< |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
200 |
> |
bootclasspath="@{classes}:${bootclasspath@{compile-target}}" |
201 |
|
includeAntRuntime="false" |
202 |
|
includeJavaRuntime="false" |
203 |
< |
executable="${javac@{target}}" |
203 |
> |
executable="${javac@{compile-target}}" |
204 |
|
fork="true"> |
205 |
|
|
206 |
|
<include name="*.java"/> |
211 |
|
|
212 |
|
</javac> |
213 |
|
|
214 |
< |
<java classname="JSR166TestCase" |
214 |
> |
<java classname="${jsr166.tckTestClass}" |
215 |
|
failonerror="true" |
216 |
|
jvm="${java@{target}}" |
217 |
|
fork="true"> |
218 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
219 |
|
<jvmarg line="@{jvmflags}"/> |
220 |
+ |
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
221 |
+ |
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
222 |
+ |
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
223 |
|
<classpath> |
224 |
|
<pathelement location="${junit.jar}"/> |
225 |
|
<pathelement location="@{workdir}/tck-classes"/> |
229 |
|
</sequential> |
230 |
|
</macrodef> |
231 |
|
|
232 |
+ |
<macrodef name="run-jtreg-tests"> |
233 |
+ |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
234 |
+ |
<attribute name="source" default="7"/> |
235 |
+ |
<attribute name="target"/> |
236 |
+ |
<attribute name="workdir"/> |
237 |
+ |
<attribute name="classes"/> |
238 |
+ |
<attribute name="jtregflags" default=""/> |
239 |
+ |
<sequential> |
240 |
+ |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
241 |
+ |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
242 |
+ |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
243 |
+ |
<mkdir dir="@{workdir}/JTreport"/> |
244 |
+ |
<jtreg dir="@{jtreg.src.dir}" |
245 |
+ |
jdk="${jdk@{target}.home}" |
246 |
+ |
workDir="@{workdir}/JTwork" |
247 |
+ |
reportDir="@{workdir}/JTreport"> |
248 |
+ |
|
249 |
+ |
<arg value="-Xbootclasspath/p:@{classes}"/> |
250 |
+ |
<arg value="-agentvm"/> |
251 |
+ |
<arg value="-v:nopass,fail"/> |
252 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
253 |
+ |
<arg value="-automatic"/> |
254 |
+ |
<arg value="-k:!ignore"/> |
255 |
+ |
<arg line="@{jtregflags}"/> |
256 |
+ |
</jtreg> |
257 |
+ |
</sequential> |
258 |
+ |
</macrodef> |
259 |
+ |
|
260 |
|
<!-- ALoops classpath --> |
261 |
|
<path id="loops.classpath"> |
262 |
|
<pathelement location="${build.loops.dir}"/> |
309 |
|
</target> |
310 |
|
|
311 |
|
|
271 |
– |
<target name="test" |
272 |
– |
depends="configure-tests, report-tests" |
273 |
– |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
274 |
– |
|
275 |
– |
|
312 |
|
<target name="docs" |
313 |
|
description="Builds javadocs for src/main to dist dir"> |
314 |
|
|
332 |
|
<arg value="-XDignore.symbol.file=true"/> |
333 |
|
<arg value="-tag"/> |
334 |
|
<arg value="${javadoc.jls.option}"/> |
335 |
+ |
<arg value="-tag"/> |
336 |
+ |
<arg value="apiNote:a:<em>API Note:</em>"/> |
337 |
+ |
<arg value="-tag"/> |
338 |
+ |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
339 |
+ |
<arg value="-tag"/> |
340 |
+ |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
341 |
|
</javadoc> |
342 |
|
</target> |
343 |
|
|
381 |
|
</target> |
382 |
|
|
383 |
|
|
342 |
– |
<!-- Internal targets --> |
343 |
– |
|
344 |
– |
|
384 |
|
<target name="dist-jar" |
385 |
|
depends="clean, jar"> |
386 |
|
<copy file="${product.jar}" todir="${dist.dir}"/> |
392 |
|
</target> |
393 |
|
|
394 |
|
|
356 |
– |
<target name="compile-tests" |
357 |
– |
depends="jar"> |
358 |
– |
|
359 |
– |
<mkdir dir="${build.testcases.dir}"/> |
360 |
– |
|
361 |
– |
<javac srcdir="${tck.src.dir}" |
362 |
– |
destdir="${build.testcases.dir}" |
363 |
– |
debug="${build.debug}" |
364 |
– |
debuglevel="${build.debuglevel}" |
365 |
– |
deprecation="${build.deprecation}" |
366 |
– |
source="6" |
367 |
– |
classpath="${junit.jar}" |
368 |
– |
bootclasspath="@{product.jar}:${bootclasspath6}" |
369 |
– |
includeAntRuntime="false" |
370 |
– |
includeJavaRuntime="false" |
371 |
– |
executable="${javac8}" |
372 |
– |
fork="true"> |
373 |
– |
|
374 |
– |
<include name="**/*.java"/> |
375 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
376 |
– |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
377 |
– |
<compilerarg line="${build.args}"/> |
378 |
– |
|
379 |
– |
</javac> |
380 |
– |
|
381 |
– |
<javac srcdir="${test.src.dir}" |
382 |
– |
destdir="${build.testcases.dir}" |
383 |
– |
debug="${build.debug}" |
384 |
– |
debuglevel="${build.debuglevel}" |
385 |
– |
deprecation="${build.deprecation}" |
386 |
– |
source="6" |
387 |
– |
classpath="" |
388 |
– |
bootclasspath="@{product.jar}:${bootclasspath6}" |
389 |
– |
includeAntRuntime="false" |
390 |
– |
includeJavaRuntime="false" |
391 |
– |
executable="${javac8}" |
392 |
– |
fork="true"> |
393 |
– |
|
394 |
– |
<include name="jsr166/test/**/*.java"/> |
395 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
396 |
– |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
397 |
– |
<compilerarg line="${build.args}"/> |
398 |
– |
|
399 |
– |
</javac> |
400 |
– |
|
401 |
– |
<!-- |
402 |
– |
<javac srcdir="${jtreg.src.dir}" |
403 |
– |
destdir="${build.testcases.dir}" |
404 |
– |
debug="${build.debug}" |
405 |
– |
debuglevel="${build.debuglevel}" |
406 |
– |
deprecation="${build.deprecation}" |
407 |
– |
source="${build.sourcelevel}" |
408 |
– |
fork="true"> |
409 |
– |
|
410 |
– |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
411 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
412 |
– |
<compilerarg line="${build.args}"/> |
413 |
– |
|
414 |
– |
</javac> |
415 |
– |
--> |
416 |
– |
|
417 |
– |
</target> |
418 |
– |
|
395 |
|
<target name="test-tck" |
396 |
|
depends="jar" |
397 |
|
description="Runs tck tests for main directly"> |
402 |
|
classes="${product.jar}"/> |
403 |
|
</target> |
404 |
|
|
405 |
< |
<target name="run-tests" |
406 |
< |
depends="compile-tests"> |
407 |
< |
|
408 |
< |
<!-- May be overridden by user.properties --> |
409 |
< |
<property name="testcase" value="*"/> |
410 |
< |
|
411 |
< |
<mkdir dir="${build.reports.dir}"/> |
436 |
< |
|
437 |
< |
<junit printsummary="true" |
438 |
< |
showoutput="true" |
439 |
< |
errorProperty="junit.failed" |
440 |
< |
failureProperty="junit.failed" |
441 |
< |
dir="${build.reports.dir}" |
442 |
< |
jvm="${java8}" |
443 |
< |
fork="true"> |
444 |
< |
|
445 |
< |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
446 |
< |
<jvmarg value="-server"/> |
447 |
< |
<jvmarg value="-showversion"/> |
448 |
< |
|
449 |
< |
<classpath refid="test.classpath"/> |
450 |
< |
|
451 |
< |
<formatter type="xml"/> |
452 |
< |
|
453 |
< |
<batchtest todir="${build.reports.dir}" unless="no.test.tck"> |
454 |
< |
<fileset dir="${tck.src.dir}"> |
455 |
< |
<include name="**/${testcase}Test.java"/> |
456 |
< |
</fileset> |
457 |
< |
</batchtest> |
458 |
< |
|
459 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.old"> |
460 |
< |
<fileset dir="${test.src.dir}"> |
461 |
< |
<include name="jsr166/test/**/${testcase}Test.java"/> |
462 |
< |
</fileset> |
463 |
< |
</batchtest> |
464 |
< |
|
465 |
< |
<!-- |
466 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.jtreg"> |
467 |
< |
<fileset dir="${jtreg.src.dir}"> |
468 |
< |
<include name="**/${testcase}Test.java"/> |
469 |
< |
</fileset> |
470 |
< |
</batchtest> |
471 |
< |
--> |
472 |
< |
|
473 |
< |
</junit> |
474 |
< |
|
405 |
> |
<target name="test-jtreg" |
406 |
> |
depends="jar" |
407 |
> |
description="Runs jtreg tests for main using the jtreg ant task"> |
408 |
> |
<run-jtreg-tests |
409 |
> |
target="8" |
410 |
> |
workdir="${build.dir}" |
411 |
> |
classes="${product.jar}"/> |
412 |
|
</target> |
413 |
|
|
414 |
< |
|
415 |
< |
<target name="report-tests" |
416 |
< |
depends="run-tests"> |
480 |
< |
|
481 |
< |
<!-- Sets junit.report.format to frames if redirection is present, |
482 |
< |
otherwise sets it to noframes. --> |
483 |
< |
<available property="junit.report.format" |
484 |
< |
value="frames" |
485 |
< |
classname="org.apache.xalan.lib.Redirect" |
486 |
< |
/> |
487 |
< |
<property name="junit.report.format" value="noframes"/> |
488 |
< |
|
489 |
< |
<junitreport todir="${build.reports.dir}"> |
490 |
< |
<fileset dir="${build.reports.dir}"> |
491 |
< |
<include name="TEST-*.xml"/> |
492 |
< |
</fileset> |
493 |
< |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
494 |
< |
/> |
495 |
< |
</junitreport> |
496 |
< |
|
497 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
498 |
< |
|
414 |
> |
<target name="test" |
415 |
> |
depends="test-tck, test-jtreg" |
416 |
> |
description="Runs tck and jtreg tests for main"> |
417 |
|
</target> |
418 |
|
|
419 |
|
|
420 |
+ |
|
421 |
|
<target name="configure-compiler"> |
422 |
|
|
423 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
435 |
|
</target> |
436 |
|
|
437 |
|
|
519 |
– |
<target name="configure-tests" |
520 |
– |
depends="configure-compiler"> |
521 |
– |
|
522 |
– |
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
523 |
– |
<available property="junit.available" |
524 |
– |
classname="junit.framework.Protectable"/> |
525 |
– |
|
526 |
– |
<!-- Xalan --> |
527 |
– |
<available property="xalan.available" |
528 |
– |
classname="org.apache.xalan.Version"/> |
529 |
– |
|
530 |
– |
|
531 |
– |
<!-- Ant 1.6beta and later don't need or want this check --> |
532 |
– |
<!-- |
533 |
– |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
534 |
– |
unless="junit.available"/> |
535 |
– |
|
536 |
– |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
537 |
– |
unless="xalan.available"/> |
538 |
– |
--> |
539 |
– |
|
540 |
– |
</target> |
541 |
– |
|
438 |
|
|
439 |
|
<!-- Various demos and test programs --> |
440 |
|
|
517 |
|
classes="${4jdk7product.jar}"> |
518 |
|
<javac-elements> |
519 |
|
<!-- JDK8+ test classes --> |
520 |
+ |
<exclude name="*8Test.java"/> |
521 |
+ |
<exclude name="DoubleAccumulatorTest.java"/> |
522 |
+ |
<exclude name="DoubleAdderTest.java"/> |
523 |
+ |
<exclude name="LongAccumulatorTest.java"/> |
524 |
+ |
<exclude name="LongAdderTest.java"/> |
525 |
+ |
<exclude name="CompletableFutureTest.java"/> |
526 |
+ |
<exclude name="SplittableRandomTest.java"/> |
527 |
|
<exclude name="StampedLockTest.java"/> |
528 |
|
</javac-elements> |
529 |
|
</run-tck-tests> |
552 |
|
|
553 |
|
<formatter type="brief"/> |
554 |
|
|
555 |
< |
<test name="JSR166TestCase" haltonfailure="no"> |
555 |
> |
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
556 |
|
</test> |
557 |
|
|
558 |
|
</junit> |
559 |
|
</target> |
560 |
|
|
561 |
|
<target name="4jdk7-test-jtreg" |
562 |
< |
depends="4jdk7compile" |
562 |
> |
depends="4jdk7jar" |
563 |
|
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
564 |
< |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
565 |
< |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
566 |
< |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
567 |
< |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
568 |
< |
<jtreg dir="${jtreg.src.dir}" |
666 |
< |
jdk="${jdk7.home}" |
667 |
< |
workDir="${build.4jdk7.dir}/JTwork" |
668 |
< |
reportDir="${build.4jdk7.dir}/JTreport"> |
669 |
< |
|
670 |
< |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
671 |
< |
<arg value="-agentvm"/> |
672 |
< |
<arg value="-v:nopass,fail"/> |
673 |
< |
<arg value="-vmoptions:-esa -ea"/> |
674 |
< |
<arg value="-automatic"/> |
675 |
< |
<arg value="-k:!ignore"/> |
676 |
< |
</jtreg> |
564 |
> |
<run-jtreg-tests |
565 |
> |
target="7" |
566 |
> |
workdir="${build.4jdk7.dir}" |
567 |
> |
classes="${4jdk7product.jar}" |
568 |
> |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
569 |
|
</target> |
570 |
|
|
571 |
|
|
900 |
|
|
901 |
|
<!-- jsr166e --> |
902 |
|
|
903 |
+ |
<property name="build.jsr166e.java.version" value="6"/> |
904 |
+ |
<property name="build.jsr166e.javac" value="${javac6}"/> |
905 |
+ |
|
906 |
|
<target name="jsr166ecompile" |
907 |
|
depends="configure-compiler" |
908 |
|
description="Compiles jsr166e sources"> |
914 |
|
debug="${build.debug}" |
915 |
|
debuglevel="${build.debuglevel}" |
916 |
|
deprecation="${build.deprecation}" |
917 |
< |
source="7" |
917 |
> |
source="${build.jsr166e.java.version}" |
918 |
|
classpath="" |
919 |
|
includeAntRuntime="false" |
920 |
|
includeJavaRuntime="false" |
921 |
< |
executable="${javac7}" |
921 |
> |
executable="${build.jsr166e.javac}" |
922 |
|
fork="true"> |
923 |
|
|
924 |
|
<include name="jsr166e/**/*.java"/> |
951 |
|
packagenames="jsr166e.*" |
952 |
|
link="${jdkapidocs.url}" |
953 |
|
access="${build.javadoc.access}" |
954 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
955 |
< |
source="7" |
954 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
955 |
> |
source="${build.jsr166e.java.version}" |
956 |
|
executable="${javadoc7}"> |
957 |
|
<arg value="-XDignore.symbol.file=true"/> |
958 |
|
|
960 |
|
</target> |
961 |
|
|
962 |
|
|
963 |
< |
<target name="jsr166e-test-tck" |
963 |
> |
<target name="jsr166e-test-tck-one-java-version" |
964 |
|
depends="jsr166ejar" |
965 |
|
description="Runs tck tests for jsr166e"> |
966 |
|
|
967 |
+ |
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
968 |
+ |
|
969 |
|
<run-tck-tests |
970 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
971 |
< |
source="7" |
1075 |
< |
target="8" |
971 |
> |
target="${build.jsr166e.java.version}" |
972 |
|
workdir="${build.jsr166e.dir}" |
973 |
|
classes="${jsr166e.jar}"/> |
974 |
|
</target> |
975 |
|
|
976 |
+ |
<target name="jsr166e-test-tck" |
977 |
+ |
description="Runs tck tests for jsr166e for multiple java versions"> |
978 |
+ |
|
979 |
+ |
<!-- <antcall target="clean"/> --> |
980 |
+ |
<!-- <antcall target="jsr166e-test-tck-one-java-version"> --> |
981 |
+ |
<!-- <param name="build.jsr166e.java.version" value="8"/> --> |
982 |
+ |
<!-- <param name="build.jsr166e.javac" value="${javac8}"/> --> |
983 |
+ |
<!-- </antcall> --> |
984 |
+ |
|
985 |
+ |
<antcall target="clean"/> |
986 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
987 |
+ |
<param name="build.jsr166e.java.version" value="7"/> |
988 |
+ |
<param name="build.jsr166e.javac" value="${javac7}"/> |
989 |
+ |
</antcall> |
990 |
+ |
|
991 |
+ |
<antcall target="clean"/> |
992 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
993 |
+ |
<param name="build.jsr166e.java.version" value="6"/> |
994 |
+ |
<param name="build.jsr166e.javac" value="${javac6}"/> |
995 |
+ |
</antcall> |
996 |
+ |
</target> |
997 |
+ |
|
998 |
|
|
999 |
|
<target name="jsr166edist" |
1000 |
|
depends="jsr166edist-jar, jsr166edist-docs" |